[GNUnet-SVN] r24880 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-11-09 23:58:48 +0100 (Fri, 09 Nov 2012)
New Revision: 24880

Modified:
   gnunet/src/testbed/test_testbed_api_controllerlink.c
   gnunet/src/testbed/test_testbed_api_testbed_run.c
   gnunet/src/testbed/test_testbed_api_topology.c
   gnunet/src/testbed/test_testbed_api_topology_clique.c
Log:
- increse timeouts and fixes

Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c        2012-11-09 
20:52:06 UTC (rev 24879)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c        2012-11-09 
22:58:48 UTC (rev 24880)
@@ -166,9 +166,9 @@
   SLAVE3_LINK_SUCCESS,
 
   /**
-   * Destory master peer
+   * Destory master peer and mark test as success
    */
-  MASTER_PEER_DESTROY_SUCCESS
+  SUCCESS
 
 };
 
@@ -538,7 +538,7 @@
     break;
  case SLAVE3_LINK_SUCCESS:
    check_operation_success (event);
-   result = MASTER_PEER_DESTROY_SUCCESS;
+   result = SUCCESS;
    GNUNET_TESTBED_operation_done (op);
    op = NULL;       
    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
@@ -653,7 +653,7 @@
                    "Unable to run the test as this system is not configured "
                    "to use password less SSH logins to localhost.\n"
                    "Marking test as successful\n");
-    result = SLAVE3_LINK_SUCCESS;
+    result = SUCCESS;
     return;
   }
   cfg = GNUNET_CONFIGURATION_dup (config);
@@ -686,7 +686,7 @@
       GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
                           "test_testbed_api_controllerlink", "nohelp", options,
                           &run, NULL);
-  if ((GNUNET_OK != ret) || (MASTER_PEER_DESTROY_SUCCESS != result))
+  if ((GNUNET_OK != ret) || (SUCCESS != result))
     return 1;
   return 0;
 }

Modified: gnunet/src/testbed/test_testbed_api_testbed_run.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run.c   2012-11-09 20:52:06 UTC 
(rev 24879)
+++ gnunet/src/testbed/test_testbed_api_testbed_run.c   2012-11-09 22:58:48 UTC 
(rev 24880)
@@ -156,7 +156,7 @@
                       NULL, &master_task, NULL);
   abort_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 60), &do_abort,
+                                    (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort,
                                     NULL);
 }
 

Modified: gnunet/src/testbed/test_testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology.c      2012-11-09 20:52:06 UTC 
(rev 24879)
+++ gnunet/src/testbed/test_testbed_api_topology.c      2012-11-09 22:58:48 UTC 
(rev 24880)
@@ -139,7 +139,7 @@
                                                   NUM_PEERS, 
GNUNET_TESTBED_TOPOLOGY_OPTION_END);
   GNUNET_assert (NULL != op);
   shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                                (GNUNET_TIME_UNIT_SECONDS, 
120),
+                                                (GNUNET_TIME_UNIT_SECONDS, 
300),
                                                 do_shutdown, NULL);
 }
 

Modified: gnunet/src/testbed/test_testbed_api_topology_clique.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology_clique.c       2012-11-09 
20:52:06 UTC (rev 24879)
+++ gnunet/src/testbed/test_testbed_api_topology_clique.c       2012-11-09 
22:58:48 UTC (rev 24880)
@@ -141,7 +141,7 @@
                                                   
GNUNET_TESTBED_TOPOLOGY_OPTION_END);
   GNUNET_assert (NULL != op);
   shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                                (GNUNET_TIME_UNIT_SECONDS, 
120),
+                                                (GNUNET_TIME_UNIT_SECONDS, 
300),
                                                 do_shutdown, NULL);
 }