summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-07-22 11:42:19 +0200
committerChristian Grothoff <christian@grothoff.org>2019-07-22 11:42:19 +0200
commit1a537490eb0e7570b060ef0663804fdd088fcf36 (patch)
tree3cf35a2692f14b5c0e88a0cc36ad14f9af1644b4
parent990e7ef3485a28c2e1d75123e9d69349c2d22712 (diff)
downloadexchange-1a537490eb0e7570b060ef0663804fdd088fcf36.tar.gz
exchange-1a537490eb0e7570b060ef0663804fdd088fcf36.tar.bz2
exchange-1a537490eb0e7570b060ef0663804fdd088fcf36.zip
fix test case clean up logic on skip
-rw-r--r--src/bank-lib/test_bank_api_twisted.c22
-rw-r--r--src/bank-lib/test_bank_api_with_fakebank_twisted.c13
2 files changed, 24 insertions, 11 deletions
diff --git a/src/bank-lib/test_bank_api_twisted.c b/src/bank-lib/test_bank_api_twisted.c
index d01dbad9..3bb149fd 100644
--- a/src/bank-lib/test_bank_api_twisted.c
+++ b/src/bank-lib/test_bank_api_twisted.c
@@ -1,6 +1,6 @@
/*
This file is part of TALER
- Copyright (C) 2014-2018 Taler Systems SA
+ Copyright (C) 2014-2019 Taler Systems SA
TALER is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
License along with TALER; see the file COPYING. If not, see
<http://www.gnu.org/licenses/>
*/
-
/**
* @file exchange/test_exchange_api_twister.c
* @brief testcase to test exchange's HTTP API interface
@@ -24,7 +23,6 @@
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
* @author Christian Grothoff
*/
-
#include "platform.h"
#include "taler_util.h"
#include "taler_signatures.h"
@@ -114,6 +112,7 @@ purge_process (struct GNUNET_OS_Process *process)
GNUNET_OS_process_destroy (process);
}
+
int
main (int argc,
char * const *argv)
@@ -134,23 +133,34 @@ main (int argc,
if (NULL == (bankd = TALER_TESTING_run_bank
(CONFIG_FILE,
bank_url)))
+ {
+ GNUNET_free (bank_url);
return 77;
+ }
if (NULL == (twister_url = TALER_TESTING_prepare_twister
(CONFIG_FILE)))
+ {
+ purge_process (bankd);
+ GNUNET_free (bank_url);
return 77;
-
+ }
+
if (NULL == (twisterd = TALER_TESTING_run_twister (CONFIG_FILE)))
+ {
+ GNUNET_free (twister_url);
+ purge_process (bankd);
+ GNUNET_free (bank_url);
return 77;
-
+ }
ret = TALER_TESTING_setup (&run,
NULL,
CONFIG_FILE,
NULL,
GNUNET_NO);
purge_process (twisterd);
- purge_process (bankd);
GNUNET_free (twister_url);
+ purge_process (bankd);
GNUNET_free (bank_url);
if (GNUNET_OK == ret)
diff --git a/src/bank-lib/test_bank_api_with_fakebank_twisted.c b/src/bank-lib/test_bank_api_with_fakebank_twisted.c
index 2b4a5493..162eb5df 100644
--- a/src/bank-lib/test_bank_api_with_fakebank_twisted.c
+++ b/src/bank-lib/test_bank_api_with_fakebank_twisted.c
@@ -16,14 +16,12 @@
License along with TALER; see the file COPYING. If not, see
<http://www.gnu.org/licenses/>
*/
-
/**
* @file exchange/test_bank_api_with_fakebank_twisted.c
* @author Marcello Stanisci
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
* @author Christian Grothoff
*/
-
#include "platform.h"
#include "taler_util.h"
#include "taler_signatures.h"
@@ -77,7 +75,7 @@ run (void *cls,
{
struct TALER_TESTING_Command commands[] = {
-
+
/**
* Can't use the "wait service" CMD here because the
* fakebank runs inside the same process of the test.
@@ -136,11 +134,16 @@ main (int argc,
if (NULL == (twister_url = TALER_TESTING_prepare_twister
(CONFIG_FILE)))
+ {
+ GNUNET_free (fakebank_url);
return 77;
-
+ }
if (NULL == (twisterd = TALER_TESTING_run_twister (CONFIG_FILE)))
+ {
+ GNUNET_free (twister_url);
+ GNUNET_free (fakebank_url);
return 77;
-
+ }
ret = TALER_TESTING_setup (&run,
NULL,
CONFIG_FILE,