- changing conf and script for tcp only

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 =
 noinst_SCRIPTS = \
  gnunet_testing.py \
  gnunet_pyexpect.py \
- test_integration_connection_value.py
+ test_integration_connection_values_tcp.py
 
 if HAVE_PYTHON_PEXPECT
 check_SCRIPTS = \
@@ -82,9 +82,9 @@ test_integration_clique_nat.py: test_integration_clique_nat.py.in Makefile
         $(do_subst) < $(srcdir)/test_integration_clique_nat.py.in > test_integration_clique_nat.py
         chmod +x test_integration_clique_nat.py 
 
-test_integration_connection_value.py: test_integration_connection_value.py.in Makefile
-        $(do_subst) < $(srcdir)/test_integration_connection_value.py.in > test_integration_connection_value.py
-        chmod +x test_integration_connection_value.py           
+test_integration_connection_values_tcp.py: test_integration_connection_values_tcp.py.in Makefile
+        $(do_subst) < $(srcdir)/test_integration_connection_values_tcp.py.in > test_integration_connection_values_tcp.py
+        chmod +x test_integration_connection_values_tcp.py              
 
 
 EXTRA_DIST = \
@@ -102,6 +102,7 @@ EXTRA_DIST = \
    confs/c_nat_client.conf \
    confs/c_no_nat_client_2.conf \
    confs/c_no_nat_client.conf \
+   confs/c_normal_client_tcp.conf \
    hostkeys/0000-hostkey \
    hostkeys/0001-hostkey \
    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 ():
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# neighbour entries allocated'))
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# entries in session map'))
   check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected'))
+  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map'))
   
   while True:
         check.reset()
@@ -90,7 +92,7 @@ def run ():
         
         test = Test ('test_integration_connection_value', verbose)
         
-        client = Peer(test, './confs/c_normal_client.conf');
+        client = Peer(test, './confs/c_normal_client_tcp.conf');
         client.start();
         
         if (client.started == True):