remove core connect call, add core to defaultservices for test case

diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf
index ab2cfb66c16e0da98c30098ec28958c6ce43e498..11938839a0dc542be9a5f35fd1b5cf178ea7d2df 100644 (file)
--- a/src/testing/test_testing_connect_peer1.conf
+++ b/src/testing/test_testing_connect_peer1.conf
@@ -19,7 +19,8 @@ PLUGINS = tcp
 PORT = 12566
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 HOSTNAME = localhost
-DEFAULTSERVICES = 
+DEFAULTSERVICES = core 
+# core in DEFAULTSERVICES required or test case will fail!
 #DEBUG = YES
 
 [statistics]

diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf
index 7730c33935bce1821804eb52fb68f72ddd19e11d..6996f4f9cd83775dc2f9ce53369a78a59e397d1b 100644 (file)
--- a/src/testing/test_testing_connect_peer2.conf
+++ b/src/testing/test_testing_connect_peer2.conf
@@ -18,7 +18,8 @@ PLUGINS = tcp
 [arm]
 PORT = 22566
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-DEFAULTSERVICES = 
+DEFAULTSERVICES = core 
+#core in DEFAULTSERVICES required or test case will fail!
 HOSTNAME = localhost
 #DEBUG = YES
 

diff --git a/src/testing/test_testing_data.conf b/src/testing/test_testing_data.conf
index a7a7be4ecac4319175dd43b8d93e1f3d6da61cdc..10231c2a4287d530dcb1448d57a7484d7112d22a 100644 (file)
--- a/src/testing/test_testing_data.conf
+++ b/src/testing/test_testing_data.conf
@@ -13,7 +13,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = 
+DEFAULTSERVICES = core
 
 [statistics]
 PORT = 2567

diff --git a/src/testing/testing.c b/src/testing/testing.c
index ba2b496db07d49e525a6210ba35a1d36fec65a12..1bd88ddc007ab03c66b098fcb0d0eba07aeacc1e 100644 (file)
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -2031,7 +2031,6 @@ GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
 
   /* Core is up! Iterate over all _known_ peers first to check if we are already connected to the peer! */
   GNUNET_assert(GNUNET_OK == GNUNET_CORE_is_peer_connected (ctx->d1->cfg, &ctx->d2->id, &core_initial_iteration, ctx));
-  GNUNET_assert(GNUNET_OK == GNUNET_CORE_is_peer_connected (ctx->d2->cfg, &ctx->d1->id, NULL, NULL));
   /*GNUNET_assert(GNUNET_OK == GNUNET_CORE_iterate_peers (ctx->d1->cfg, &core_initial_iteration, ctx));*/
 }