aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-12-19 15:02:56 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-12-19 15:02:56 +0000
commite5607fbc97ee4d5c67589d31217fba947bea7131 (patch)
tree395181c79a211b757a6320305cbb693af7675496
parent2c4e38eae8b9bf8b3c884a4d9a2bd48996d37e73 (diff)
fixing some timeouts
-rwxr-xr-xsrc/integration-tests/test_integration_clique.py.in2
-rwxr-xr-xsrc/integration-tests/test_integration_disconnect.py.in2
-rwxr-xr-xsrc/integration-tests/test_integration_restart.py.in4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index faf66a7d2e..5cd8d9bb53 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -42,7 +42,7 @@ from gnunet_testing import *
testname = "test_integration_clique"
verbose = True
-check_timeout = 120
+check_timeout = 30
def cleanup ():
diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index d055b69074..537ae86bfb 100755
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.py.in
@@ -103,7 +103,7 @@ def check_connect ():
check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
- check.run_blocking (10, success_connect_cont, fail_connect_cont)
+ check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont)
#
# Test execution
diff --git a/src/integration-tests/test_integration_restart.py.in b/src/integration-tests/test_integration_restart.py.in
index f8becb66a4..6a5c2ba4f6 100755
--- a/src/integration-tests/test_integration_restart.py.in
+++ b/src/integration-tests/test_integration_restart.py.in
@@ -95,7 +95,7 @@ def success_connect_cont (check):
check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
- check.run_blocking (10, success_restart_cont, fail_restart_cont)
+ check.run_blocking (check_timeout, success_restart_cont, fail_restart_cont)
def fail_connect_cont (check):
@@ -118,7 +118,7 @@ def check_connect ():
check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
- check.run_blocking (10, success_connect_cont, fail_connect_cont)
+ check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont)
#
# Test execution