diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-04-03 13:59:25 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-04-03 13:59:25 +0000 |
commit | 12a1d5b119265e96eb293275b8a504c19e32ad61 (patch) | |
tree | 166b39a8182509034b7e72c18f0e60288c7c77c9 | |
parent | 05ed673956a3dec34598db71dd079ec72cd61a9c (diff) | |
download | gnunet-12a1d5b119265e96eb293275b8a504c19e32ad61.tar.gz gnunet-12a1d5b119265e96eb293275b8a504c19e32ad61.zip |
- changing conf and script for tcp only
-rw-r--r-- | src/integration-tests/Makefile.am | 9 | ||||
-rw-r--r-- | src/integration-tests/confs/c_normal_client_tcp.conf (renamed from src/integration-tests/confs/c_normal_client.conf) | 0 | ||||
-rwxr-xr-x | src/integration-tests/test_integration_connection_values_tcp.py.in (renamed from src/integration-tests/test_integration_connection_value.py.in) | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 81dcbcb11..9d5177b70 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
@@ -16,7 +16,7 @@ check_PROGRAMS = | |||
16 | noinst_SCRIPTS = \ | 16 | noinst_SCRIPTS = \ |
17 | gnunet_testing.py \ | 17 | gnunet_testing.py \ |
18 | gnunet_pyexpect.py \ | 18 | gnunet_pyexpect.py \ |
19 | test_integration_connection_value.py | 19 | test_integration_connection_values_tcp.py |
20 | 20 | ||
21 | if HAVE_PYTHON_PEXPECT | 21 | if HAVE_PYTHON_PEXPECT |
22 | check_SCRIPTS = \ | 22 | check_SCRIPTS = \ |
@@ -82,9 +82,9 @@ test_integration_clique_nat.py: test_integration_clique_nat.py.in Makefile | |||
82 | $(do_subst) < $(srcdir)/test_integration_clique_nat.py.in > test_integration_clique_nat.py | 82 | $(do_subst) < $(srcdir)/test_integration_clique_nat.py.in > test_integration_clique_nat.py |
83 | chmod +x test_integration_clique_nat.py | 83 | chmod +x test_integration_clique_nat.py |
84 | 84 | ||
85 | test_integration_connection_value.py: test_integration_connection_value.py.in Makefile | 85 | test_integration_connection_values_tcp.py: test_integration_connection_values_tcp.py.in Makefile |
86 | $(do_subst) < $(srcdir)/test_integration_connection_value.py.in > test_integration_connection_value.py | 86 | $(do_subst) < $(srcdir)/test_integration_connection_values_tcp.py.in > test_integration_connection_values_tcp.py |
87 | chmod +x test_integration_connection_value.py | 87 | chmod +x test_integration_connection_values_tcp.py |
88 | 88 | ||
89 | 89 | ||
90 | EXTRA_DIST = \ | 90 | EXTRA_DIST = \ |
@@ -102,6 +102,7 @@ EXTRA_DIST = \ | |||
102 | confs/c_nat_client.conf \ | 102 | confs/c_nat_client.conf \ |
103 | confs/c_no_nat_client_2.conf \ | 103 | confs/c_no_nat_client_2.conf \ |
104 | confs/c_no_nat_client.conf \ | 104 | confs/c_no_nat_client.conf \ |
105 | confs/c_normal_client_tcp.conf \ | ||
105 | hostkeys/0000-hostkey \ | 106 | hostkeys/0000-hostkey \ |
106 | hostkeys/0001-hostkey \ | 107 | hostkeys/0001-hostkey \ |
107 | hostkeys/0002-hostkey \ | 108 | hostkeys/0002-hostkey \ |
diff --git a/src/integration-tests/confs/c_normal_client.conf b/src/integration-tests/confs/c_normal_client_tcp.conf index c5de78b79..c5de78b79 100644 --- a/src/integration-tests/confs/c_normal_client.conf +++ b/src/integration-tests/confs/c_normal_client_tcp.conf | |||
diff --git a/src/integration-tests/test_integration_connection_value.py.in b/src/integration-tests/test_integration_connection_values_tcp.py.in index 38bf633dd..6c0072a3e 100755 --- a/src/integration-tests/test_integration_connection_value.py.in +++ b/src/integration-tests/test_integration_connection_values_tcp.py.in | |||
@@ -67,6 +67,8 @@ def check_connect (): | |||
67 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# neighbour entries allocated')) | 67 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# neighbour entries allocated')) |
68 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# entries in session map')) | 68 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# entries in session map')) |
69 | check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client, 'core', '# entries in session map')) | 69 | check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client, 'core', '# entries in session map')) |
70 | check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected')) | ||
71 | check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map')) | ||
70 | 72 | ||
71 | while True: | 73 | while True: |
72 | check.reset() | 74 | check.reset() |
@@ -90,7 +92,7 @@ def run (): | |||
90 | 92 | ||
91 | test = Test ('test_integration_connection_value', verbose) | 93 | test = Test ('test_integration_connection_value', verbose) |
92 | 94 | ||
93 | client = Peer(test, './confs/c_normal_client.conf'); | 95 | client = Peer(test, './confs/c_normal_client_tcp.conf'); |
94 | client.start(); | 96 | client.start(); |
95 | 97 | ||
96 | if (client.started == True): | 98 | if (client.started == True): |