aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests
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 /src/integration-tests
parent2c4e38eae8b9bf8b3c884a4d9a2bd48996d37e73 (diff)
downloadgnunet-e5607fbc97ee4d5c67589d31217fba947bea7131.tar.gz
gnunet-e5607fbc97ee4d5c67589d31217fba947bea7131.zip
fixing some timeouts
Diffstat (limited to 'src/integration-tests')
-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 faf66a7d2..5cd8d9bb5 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 *
42 42
43testname = "test_integration_clique" 43testname = "test_integration_clique"
44verbose = True 44verbose = True
45check_timeout = 120 45check_timeout = 30
46 46
47 47
48def cleanup (): 48def cleanup ():
diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index d055b6907..537ae86bf 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 ():
103 check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) 103 check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
104 check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) 104 check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
105 105
106 check.run_blocking (10, success_connect_cont, fail_connect_cont) 106 check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont)
107 107
108# 108#
109# Test execution 109# Test execution
diff --git a/src/integration-tests/test_integration_restart.py.in b/src/integration-tests/test_integration_restart.py.in
index f8becb66a..6a5c2ba4f 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):
95 check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) 95 check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
96 check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) 96 check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
97 97
98 check.run_blocking (10, success_restart_cont, fail_restart_cont) 98 check.run_blocking (check_timeout, success_restart_cont, fail_restart_cont)
99 99
100 100
101def fail_connect_cont (check): 101def fail_connect_cont (check):
@@ -118,7 +118,7 @@ def check_connect ():
118 check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) 118 check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
119 check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) 119 check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
120 120
121 check.run_blocking (10, success_connect_cont, fail_connect_cont) 121 check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont)
122 122
123# 123#
124# Test execution 124# Test execution