aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLRN <lrn1986@gmail.com>2013-02-27 23:13:58 +0000
committerLRN <lrn1986@gmail.com>2013-02-27 23:13:58 +0000
commitb4f30266912920d54a9684df127acc3e0f2d0212 (patch)
tree5b7f28031bff58c51ed6a934174226b36dadeec4
parent05c344135e8c5dd165d97b1e117a9bdac77016bc (diff)
downloadgnunet-b4f30266912920d54a9684df127acc3e0f2d0212.tar.gz
gnunet-b4f30266912920d54a9684df127acc3e0f2d0212.zip
NS test: Use different URIs for different phases
-rw-r--r--src/fs/test_fs_namespace.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 61f304487..5d7eb841c 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -260,6 +260,7 @@ sks_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
260 struct GNUNET_FS_Uri *ksk_uri; 260 struct GNUNET_FS_Uri *ksk_uri;
261 char *msg; 261 char *msg;
262 struct GNUNET_FS_BlockOptions bo; 262 struct GNUNET_FS_BlockOptions bo;
263 char *suri;
263 264
264 if (NULL == uri) 265 if (NULL == uri)
265 { 266 {
@@ -271,7 +272,9 @@ sks_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
271 FPRINTF (stderr, "%s", "Published sks\n"); 272 FPRINTF (stderr, "%s", "Published sks\n");
272 meta = GNUNET_CONTAINER_meta_data_create (); 273 meta = GNUNET_CONTAINER_meta_data_create ();
273 msg = NULL; 274 msg = NULL;
274 ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/ns-search", &msg); 275 GNUNET_asprintf (&suri, "gnunet://fs/ksk/ns-search%d", phase);
276 ksk_uri = GNUNET_FS_uri_parse (suri, &msg);
277 GNUNET_free (suri);
275 GNUNET_assert (NULL == msg); 278 GNUNET_assert (NULL == msg);
276 ksk_expect_uri = GNUNET_FS_uri_dup (uri); 279 ksk_expect_uri = GNUNET_FS_uri_dup (uri);
277 bo.content_priority = 1; 280 bo.content_priority = 1;
@@ -337,6 +340,7 @@ testCreatedNamespace (struct GNUNET_FS_Namespace *ns)
337 struct GNUNET_CONTAINER_MetaData *meta; 340 struct GNUNET_CONTAINER_MetaData *meta;
338 struct GNUNET_FS_Uri *ksk_uri; 341 struct GNUNET_FS_Uri *ksk_uri;
339 int ok; 342 int ok;
343 char *uri;
340 344
341 FPRINTF (stderr, "%s", "Listing namespaces\n"); 345 FPRINTF (stderr, "%s", "Listing namespaces\n");
342 ok = GNUNET_NO; 346 ok = GNUNET_NO;
@@ -351,7 +355,9 @@ testCreatedNamespace (struct GNUNET_FS_Namespace *ns)
351 } 355 }
352 FPRINTF (stderr, "%s", "Creating an advertising\n"); 356 FPRINTF (stderr, "%s", "Creating an advertising\n");
353 meta = GNUNET_CONTAINER_meta_data_create (); 357 meta = GNUNET_CONTAINER_meta_data_create ();
354 ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/testnsa", NULL); 358 GNUNET_asprintf (&uri, "gnunet://fs/ksk/testnsa%d", phase);
359 ksk_uri = GNUNET_FS_uri_parse (uri, NULL);
360 GNUNET_free (uri);
355 bo.content_priority = 1; 361 bo.content_priority = 1;
356 bo.anonymity_level = 1; 362 bo.anonymity_level = 1;
357 bo.replication_level = 0; 363 bo.replication_level = 0;