From: Grigorii Demidov <grigorii.demidov@nic.cz>
Date: Wed, 5 Aug 2015 12:57:09 +0000 (+0200)
Subject: tests: increased subprocess timeout
X-Git-Tag: v1.0.0-beta1~58^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e46d3bdfab1f71b708ce5a5c992174f321cc5c5e;p=thirdparty%2Fknot-resolver.git

tests: increased subprocess timeout
---

diff --git a/tests/pydnstest/testserver.py b/tests/pydnstest/testserver.py
index 4fc6fb7cf..4d2931e47 100644
--- a/tests/pydnstest/testserver.py
+++ b/tests/pydnstest/testserver.py
@@ -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)
 
diff --git a/tests/test_integration.py b/tests/test_integration.py
index 799668c6a..b22de7728 100755
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -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"])