[GNUnet-SVN] r14624 - gnunet/src/testing

[gnunet]

Author: nevans
Date: 2011-03-10 12:58:22 +0100 (Thu, 10 Mar 2011)
New Revision: 14624

Modified:
   gnunet/src/testing/test_testing_connect_peer1.conf
   gnunet/src/testing/test_testing_connect_peer2.conf
   gnunet/src/testing/test_testing_data.conf
   gnunet/src/testing/testing.c
Log:
remove core connect call, add core to defaultservices for test case

Modified: gnunet/src/testing/test_testing_connect_peer1.conf
===================================================================
--- gnunet/src/testing/test_testing_connect_peer1.conf  2011-03-10 10:34:22 UTC 
(rev 14623)
+++ gnunet/src/testing/test_testing_connect_peer1.conf  2011-03-10 11:58:22 UTC 
(rev 14624)
@@ -19,7 +19,8 @@
 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]

Modified: gnunet/src/testing/test_testing_connect_peer2.conf
===================================================================
--- gnunet/src/testing/test_testing_connect_peer2.conf  2011-03-10 10:34:22 UTC 
(rev 14623)
+++ gnunet/src/testing/test_testing_connect_peer2.conf  2011-03-10 11:58:22 UTC 
(rev 14624)
@@ -18,7 +18,8 @@
 [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
 

Modified: gnunet/src/testing/test_testing_data.conf
===================================================================
--- gnunet/src/testing/test_testing_data.conf   2011-03-10 10:34:22 UTC (rev 
14623)
+++ gnunet/src/testing/test_testing_data.conf   2011-03-10 11:58:22 UTC (rev 
14624)
@@ -13,7 +13,7 @@
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = 
+DEFAULTSERVICES = core
 
 [statistics]
 PORT = 2567

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2011-03-10 10:34:22 UTC (rev 14623)
+++ gnunet/src/testing/testing.c        2011-03-10 11:58:22 UTC (rev 14624)
@@ -2031,7 +2031,6 @@
 
   /* 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));*/
 }