diff options
-rw-r--r-- | src/lockmanager/test_lockmanager_api.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/lockmanager/test_lockmanager_api.c b/src/lockmanager/test_lockmanager_api.c index 117517e6e..102e19841 100644 --- a/src/lockmanager/test_lockmanager_api.c +++ b/src/lockmanager/test_lockmanager_api.c | |||
@@ -83,11 +83,6 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
83 | abort_task_id = GNUNET_SCHEDULER_NO_TASK; | 83 | abort_task_id = GNUNET_SCHEDULER_NO_TASK; |
84 | } | 84 | } |
85 | 85 | ||
86 | if (NULL != request) | ||
87 | { | ||
88 | GNUNET_LOCKMANAGER_cancel_request (request); | ||
89 | request = NULL; | ||
90 | } | ||
91 | GNUNET_LOCKMANAGER_disconnect (handle); | 86 | GNUNET_LOCKMANAGER_disconnect (handle); |
92 | if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM)) | 87 | if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM)) |
93 | { | 88 | { |
@@ -96,6 +91,10 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
96 | } | 91 | } |
97 | GNUNET_OS_process_wait (arm_pid); | 92 | GNUNET_OS_process_wait (arm_pid); |
98 | GNUNET_OS_process_close (arm_pid); | 93 | GNUNET_OS_process_close (arm_pid); |
94 | |||
95 | if (NULL != config) | ||
96 | GNUNET_CONFIGURATION_destroy (config); | ||
97 | |||
99 | if (GNUNET_SYSERR != result) | 98 | if (GNUNET_SYSERR != result) |
100 | result = GNUNET_OK; | 99 | result = GNUNET_OK; |
101 | } | 100 | } |
@@ -133,6 +132,11 @@ status_cb (void *cls, | |||
133 | uint32_t lock, | 132 | uint32_t lock, |
134 | enum GNUNET_LOCKMANAGER_Status status) | 133 | enum GNUNET_LOCKMANAGER_Status status) |
135 | { | 134 | { |
135 | if (NULL != request) | ||
136 | { | ||
137 | GNUNET_LOCKMANAGER_cancel_request (request); | ||
138 | request = NULL; | ||
139 | } | ||
136 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1), | 140 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1), |
137 | &do_shutdown, | 141 | &do_shutdown, |
138 | NULL); | 142 | NULL); |