aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2011-10-21 09:22:52 +0000
committerBart Polot <bart@net.in.tum.de>2011-10-21 09:22:52 +0000
commit78ead844f692faca1508ebcba27ca12e496bc79b (patch)
tree65d56bbe2cfa8f8ec8650f5a6bcd2ba1b66bf79a
parent2e5728ed08182ec9e3fe58468a1ab4e1f48679e4 (diff)
downloadgnunet-78ead844f692faca1508ebcba27ca12e496bc79b.tar.gz
gnunet-78ead844f692faca1508ebcba27ca12e496bc79b.zip
Wait more to complete tests on slower machines
-rw-r--r--src/mesh/test_mesh_small.c12
-rw-r--r--src/mesh/test_mesh_small.conf6
2 files changed, 14 insertions, 4 deletions
diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c
index 1cb9d6181..f100a40e4 100644
--- a/src/mesh/test_mesh_small.c
+++ b/src/mesh/test_mesh_small.c
@@ -55,7 +55,7 @@ struct StatsContext
55/** 55/**
56 * Time to wait for stuff that should be rather fast 56 * Time to wait for stuff that should be rather fast
57 */ 57 */
58#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) 58#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
59 59
60/** 60/**
61 * DIFFERENT TESTS TO RUN 61 * DIFFERENT TESTS TO RUN
@@ -883,6 +883,16 @@ main (int argc, char *argv[])
883#endif 883#endif
884 NULL 884 NULL
885 }; 885 };
886
887 /* Each peer is supposed to generate the following callbacks:
888 * 1 incoming tunnel (@dest)
889 * 1 connected peer (@orig)
890 * 1 received data packet (@dest)
891 * 1 received data packet (@orig)
892 * 1 received tunnel destroy (@dest)
893 * _________________________________
894 * 5 x ok expected per peer
895 */
886 int ok_goal; 896 int ok_goal;
887 897
888 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: Start\n"); 898 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "***************** test: Start\n");
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index 90bae9ab2..f98dca7dc 100644
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -40,8 +40,8 @@ INTERNAL_ADDRESS = 127.0.0.1
40EXTERNAL_ADDRESS = 127.0.0.1 40EXTERNAL_ADDRESS = 127.0.0.1
41 41
42[core] 42[core]
43TOTAL_QUOTA_IN = 4000000 43TOTAL_QUOTA_IN = 99111999
44TOTAL_QUOTA_OUT = 4000000 44TOTAL_QUOTA_OUT = 99111999
45AUTOSTART = YES 45AUTOSTART = YES
46PORT = 10003 46PORT = 10003
47 47
@@ -85,6 +85,6 @@ MAX_OUTSTANDING_CONNECTIONS = 75
85DELETE_FILES = YES 85DELETE_FILES = YES
86 86
87[test_mesh_small] 87[test_mesh_small]
88WAIT_TIME = 90 88WAIT_TIME = 300
89CONNECTION_LIMIT = 16 89CONNECTION_LIMIT = 16
90DATA_OUTPUT_FILE=data_output 90DATA_OUTPUT_FILE=data_output