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

[gnunet]

Author: nevans
Date: 2010-06-14 14:17:19 +0200 (Mon, 14 Jun 2010)
New Revision: 11740

Modified:
   gnunet/src/testing/test_testing_data_topology_2d_torus.conf
   gnunet/src/testing/test_testing_data_topology_blacklist.conf
   gnunet/src/testing/test_testing_data_topology_clique.conf
   gnunet/src/testing/test_testing_data_topology_clique_dfs.conf
   gnunet/src/testing/test_testing_data_topology_clique_minimum.conf
   gnunet/src/testing/test_testing_data_topology_clique_random.conf
   gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf
   gnunet/src/testing/test_testing_data_topology_internat.conf
   gnunet/src/testing/test_testing_data_topology_ring.conf
   gnunet/src/testing/test_testing_data_topology_scale_free.conf
   gnunet/src/testing/test_testing_data_topology_small_world_ring.conf
   gnunet/src/testing/test_testing_data_topology_small_world_torus.conf
Log:
change to configs, use readable names for topologies and connect options 
instead of cryptic numbers

Modified: gnunet/src/testing/test_testing_data_topology_2d_torus.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_2d_torus.conf 2010-06-14 
11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_2d_torus.conf 2010-06-14 
12:17:19 UTC (rev 11740)
@@ -32,5 +32,5 @@
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 4
+TOPOLOGY = 2D_TORUS
 F2F = YES

Modified: gnunet/src/testing/test_testing_data_topology_blacklist.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_blacklist.conf        
2010-06-14 11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_blacklist.conf        
2010-06-14 12:17:19 UTC (rev 11740)
@@ -1,6 +1,6 @@
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
+DEFAULTCONFIG = test_testing_data_topology_blacklist.conf
 
 [resolver]
 PORT = 2564
@@ -43,7 +43,7 @@
 [testing]
 NUM_PEERS = 4
 WEAKRANDOM = YES
-TOPOLOGY = 0
-BLACKLIST_TOPOLOGY = 3
+TOPOLOGY = CLIQUE
+BLACKLIST_TOPOLOGY = RING
 BLACKLIST_TRANSPORTS = tcp udp http
 F2F = YES

Modified: gnunet/src/testing/test_testing_data_topology_clique.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique.conf   2010-06-14 
11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_clique.conf   2010-06-14 
12:17:19 UTC (rev 11740)
@@ -11,6 +11,7 @@
 #PREFIX = xterm -e xterm -T transport -e gdb --args
 #BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
 #PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#PREFIX = valgrind --tool=callgrind --log-file=callgrind.%p
 #DEBUG = YES
 
 [arm]
@@ -42,6 +43,6 @@
 [testing]
 NUM_PEERS = 4
 WEAKRANDOM = YES
-TOPOLOGY = 0
+TOPOLOGY = CLIQUE
 F2F = YES
 #DEBUG = YES

Modified: gnunet/src/testing/test_testing_data_topology_clique_dfs.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique_dfs.conf       
2010-06-14 11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_clique_dfs.conf       
2010-06-14 12:17:19 UTC (rev 11740)
@@ -42,7 +42,7 @@
 [testing]
 NUM_PEERS = 7
 WEAKRANDOM = YES
-TOPOLOGY = 0
-CONNECT_TOPOLOGY_OPTION = 3
+TOPOLOGY = CLIQUE
+CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
 CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
 F2F = YES

Modified: gnunet/src/testing/test_testing_data_topology_clique_minimum.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique_minimum.conf   
2010-06-14 11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_clique_minimum.conf   
2010-06-14 12:17:19 UTC (rev 11740)
@@ -42,7 +42,7 @@
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 0
-CONNECT_TOPOLOGY_OPTION = 2
+TOPOLOGY = CLIQUE
+CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
 CONNECT_TOPOLOGY_OPTION_MODIFIER = 1.0
 F2F = YES

Modified: gnunet/src/testing/test_testing_data_topology_clique_random.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique_random.conf    
2010-06-14 11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_clique_random.conf    
2010-06-14 12:17:19 UTC (rev 11740)
@@ -42,7 +42,7 @@
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 0
-CONNECT_TOPOLOGY_OPTION = 1
+TOPOLOGY = CLIQUE
+CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
 CONNECT_TOPOLOGY_OPTION_MODIFIER = .5
 F2F = YES

Modified: gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf      
2010-06-14 11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf      
2010-06-14 12:17:19 UTC (rev 11740)
@@ -32,5 +32,5 @@
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 5
+TOPOLOGY = ERDOS_RENYI
 F2F = YES

Modified: gnunet/src/testing/test_testing_data_topology_internat.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_internat.conf 2010-06-14 
11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_internat.conf 2010-06-14 
12:17:19 UTC (rev 11740)
@@ -32,5 +32,5 @@
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 6
+TOPOLOGY = INTERNAT
 F2F = YES

Modified: gnunet/src/testing/test_testing_data_topology_ring.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_ring.conf     2010-06-14 
11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_ring.conf     2010-06-14 
12:17:19 UTC (rev 11740)
@@ -32,6 +32,6 @@
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 3
+TOPOLOGY = RING
 F2F = YES
 BLACKLISTING = YES

Modified: gnunet/src/testing/test_testing_data_topology_scale_free.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_scale_free.conf       
2010-06-14 11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_scale_free.conf       
2010-06-14 12:17:19 UTC (rev 11740)
@@ -42,5 +42,5 @@
 [testing]
 NUM_PEERS = 500
 WEAKRANDOM = YES
-TOPOLOGY = 7
+TOPOLOGY = SCALE_FREE
 F2F = YES

Modified: gnunet/src/testing/test_testing_data_topology_small_world_ring.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_small_world_ring.conf 
2010-06-14 11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_small_world_ring.conf 
2010-06-14 12:17:19 UTC (rev 11740)
@@ -32,5 +32,5 @@
 [testing]
 NUM_PEERS = 25
 WEAKRANDOM = YES
-TOPOLOGY = 2
+TOPOLOGY = SMALL_WORLD_RING
 F2F = YES

Modified: gnunet/src/testing/test_testing_data_topology_small_world_torus.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_small_world_torus.conf        
2010-06-14 11:21:52 UTC (rev 11739)
+++ gnunet/src/testing/test_testing_data_topology_small_world_torus.conf        
2010-06-14 12:17:19 UTC (rev 11740)
@@ -32,5 +32,5 @@
 [testing]
 NUM_PEERS = 5
 WEAKRANDOM = YES
-TOPOLOGY = 1
+TOPOLOGY = SMALL_WORLD
 F2F = YES