aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-02-22 08:47:39 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-02-22 08:47:39 +0000
commit20621b6f9076dbedb1926fff2fcf5ec87a7d986b (patch)
treef71b21b730208f09e81e6d40a16b0301f8a9ef18
parentc1ffaed27d7cb9236f368c00f68efe67b65d3f45 (diff)
downloadgnunet-20621b6f9076dbedb1926fff2fcf5ec87a7d986b.tar.gz
gnunet-20621b6f9076dbedb1926fff2fcf5ec87a7d986b.zip
fix test
-rw-r--r--src/ats/test_ats_api_common.c5
-rw-r--r--src/ats/test_ats_api_common.h2
-rw-r--r--src/ats/test_ats_simplistic_pref_aging.c4
3 files changed, 4 insertions, 7 deletions
diff --git a/src/ats/test_ats_api_common.c b/src/ats/test_ats_api_common.c
index f8d106a7f..865268c2e 100644
--- a/src/ats/test_ats_api_common.c
+++ b/src/ats/test_ats_api_common.c
@@ -25,14 +25,9 @@
25 */ 25 */
26 26
27#include "test_ats_api_common.h" 27#include "test_ats_api_common.h"
28
29#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
30#define BIG_M_STRING "unlimited" 28#define BIG_M_STRING "unlimited"
31 29
32 30
33#define PEERID0 "2AK99KD8RM9UA9LC3QKA0IQ5UBFC0FBB50EBGCFQT8448DGGACNAC4CJQDD1CPFS494O41U88DJD1FLIG8VA5CQR9IN4L96GP104MVO"
34#define PEERID1 "5ED7I0AR3MSTAL7FQN04S22E0EQ3CR9RLASCDLVMM1BNFPUPTCT46DLKNJ4DACASJ6U0DR5J8S3R2UJL49682JS7MOVRAB8P8A4PJH0"
35
36void 31void
37create_test_address (struct Test_Address *dest, char * plugin, void *session, void *addr, size_t addrlen) 32create_test_address (struct Test_Address *dest, char * plugin, void *session, void *addr, size_t addrlen)
38{ 33{
diff --git a/src/ats/test_ats_api_common.h b/src/ats/test_ats_api_common.h
index 223d0c038..1f9bd10c1 100644
--- a/src/ats/test_ats_api_common.h
+++ b/src/ats/test_ats_api_common.h
@@ -29,7 +29,7 @@
29#include "gnunet_ats_service.h" 29#include "gnunet_ats_service.h"
30#include "gnunet-service-ats_addresses.h" 30#include "gnunet-service-ats_addresses.h"
31 31
32#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) 32#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
33 33
34#define PEERID0 "2AK99KD8RM9UA9LC3QKA0IQ5UBFC0FBB50EBGCFQT8448DGGACNAC4CJQDD1CPFS494O41U88DJD1FLIG8VA5CQR9IN4L96GP104MVO" 34#define PEERID0 "2AK99KD8RM9UA9LC3QKA0IQ5UBFC0FBB50EBGCFQT8448DGGACNAC4CJQDD1CPFS494O41U88DJD1FLIG8VA5CQR9IN4L96GP104MVO"
35#define PEERID1 "5ED7I0AR3MSTAL7FQN04S22E0EQ3CR9RLASCDLVMM1BNFPUPTCT46DLKNJ4DACASJ6U0DR5J8S3R2UJL49682JS7MOVRAB8P8A4PJH0" 35#define PEERID1 "5ED7I0AR3MSTAL7FQN04S22E0EQ3CR9RLASCDLVMM1BNFPUPTCT46DLKNJ4DACASJ6U0DR5J8S3R2UJL49682JS7MOVRAB8P8A4PJH0"
diff --git a/src/ats/test_ats_simplistic_pref_aging.c b/src/ats/test_ats_simplistic_pref_aging.c
index 8591ef13e..2681b87f5 100644
--- a/src/ats/test_ats_simplistic_pref_aging.c
+++ b/src/ats/test_ats_simplistic_pref_aging.c
@@ -103,7 +103,7 @@ static void
103end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 103end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
104{ 104{
105 die_task = GNUNET_SCHEDULER_NO_TASK; 105 die_task = GNUNET_SCHEDULER_NO_TASK;
106 106 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error! Shutting down\n");
107 if (sched_ats != NULL) 107 if (sched_ats != NULL)
108 { 108 {
109 GNUNET_ATS_scheduling_done (sched_ats); 109 GNUNET_ATS_scheduling_done (sched_ats);
@@ -297,6 +297,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
297 if ((GNUNET_YES == sug_p0) && (GNUNET_YES == sug_p1)) 297 if ((GNUNET_YES == sug_p0) && (GNUNET_YES == sug_p1))
298 { 298 {
299 /* Done ! */ 299 /* Done ! */
300 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Done!\n");
300 stage ++; 301 stage ++;
301 ret = 0; 302 ret = 0;
302 GNUNET_SCHEDULER_add_now (&end,NULL); 303 GNUNET_SCHEDULER_add_now (&end,NULL);
@@ -308,6 +309,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
308error: 309error:
309 /* Error ! */ 310 /* Error ! */
310 ret = 1; 311 ret = 1;
312 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Error!\n");
311 GNUNET_SCHEDULER_add_now (&end,NULL); 313 GNUNET_SCHEDULER_add_now (&end,NULL);
312} 314}
313 315