]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
tests: increased subprocess timeout
authorGrigorii Demidov <grigorii.demidov@nic.cz>
Wed, 5 Aug 2015 12:57:09 +0000 (14:57 +0200)
committerGrigorii Demidov <grigorii.demidov@nic.cz>
Wed, 5 Aug 2015 12:57:09 +0000 (14:57 +0200)
tests/pydnstest/testserver.py
tests/test_integration.py

index 4fc6fb7cf554c9ae908ccd6e7f30ec176a2ad5ae..4d2931e475b08708095ac1b51f2e50ebc062c6b1 100644 (file)
@@ -86,7 +86,6 @@ class TestServer:
         self.peer_iface = p_iface
 
         self.map_adresses()
-        self.start()
 
 
     def __del__(self):
@@ -101,8 +100,7 @@ class TestServer:
         if TEST_DEBUG > 0:
             syn_print(None, "start")
         if self.active is True:
-            if TEST_DEBUG > 0:
-                syn_print(None, "TestServer already started")
+            raise Exception('TestServer already started')
         self.active = True
         self.start_srv(self.kroot_local, self.kroot_family)
 
index 799668c6ae510f2f03dd20e7a54bd9771ae450e5..b22de7728937dcc7abc48d5295bce60cd94f5fe6 100755 (executable)
@@ -30,7 +30,7 @@ def del_files(path_to):
 DEFAULT_IFACE = 0
 CHILD_IFACE = 0
 TMPDIR = ""
-SUBPROCESS_WAIT_TOUT = 0.2
+SUBPROCESS_WAIT_TOUT = 1
 
 if "SOCKET_WRAPPER_DEFAULT_IFACE" in os.environ:
    DEFAULT_IFACE = int(os.environ["SOCKET_WRAPPER_DEFAULT_IFACE"])