taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix test case clean up logic on skip

Browse Source
This commit is contained in:
Christian Grothoff 2019-07-22 11:42:19 +02:00
parent 990e7ef348
commit 1a537490eb
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bank-lib/test_bank_api_twisted.c
View File

@ -1,6 +1,6 @@
/* /*
This file is part of TALER 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 TALER is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as 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 License along with TALER; see the file COPYING. If not, see
<http://www.gnu.org/licenses/> <http://www.gnu.org/licenses/>
*/ */
/** /**
* @file exchange/test_exchange_api_twister.c * @file exchange/test_exchange_api_twister.c
* @brief testcase to test exchange's HTTP API interface * @brief testcase to test exchange's HTTP API interface
@ -24,7 +23,6 @@
* @author Sree Harsha Totakura <sreeharsha@totakura.in> * @author Sree Harsha Totakura <sreeharsha@totakura.in>
* @author Christian Grothoff * @author Christian Grothoff
*/ */
#include "platform.h" #include "platform.h"
#include "taler_util.h" #include "taler_util.h"
#include "taler_signatures.h" #include "taler_signatures.h"
@ -114,6 +112,7 @@ purge_process (struct GNUNET_OS_Process *process)
GNUNET_OS_process_destroy (process); GNUNET_OS_process_destroy (process);
} }
int int
main (int argc, main (int argc,
char * const *argv) char * const *argv)
@ -134,23 +133,34 @@ main (int argc,
if (NULL == (bankd = TALER_TESTING_run_bank if (NULL == (bankd = TALER_TESTING_run_bank
(CONFIG_FILE, (CONFIG_FILE,
bank_url))) bank_url)))
{
GNUNET_free (bank_url);
return 77; return 77;
}
if (NULL == (twister_url = TALER_TESTING_prepare_twister if (NULL == (twister_url = TALER_TESTING_prepare_twister
(CONFIG_FILE))) (CONFIG_FILE)))
{
purge_process (bankd);
GNUNET_free (bank_url);
return 77; return 77;
}
if (NULL == (twisterd = TALER_TESTING_run_twister (CONFIG_FILE)))
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, ret = TALER_TESTING_setup (&run,
NULL, NULL,
CONFIG_FILE, CONFIG_FILE,
NULL, NULL,
GNUNET_NO); GNUNET_NO);
purge_process (twisterd); purge_process (twisterd);
purge_process (bankd);
GNUNET_free (twister_url); GNUNET_free (twister_url);
purge_process (bankd);
GNUNET_free (bank_url); GNUNET_free (bank_url);
if (GNUNET_OK == ret) if (GNUNET_OK == ret)

13
src/bank-lib/test_bank_api_with_fakebank_twisted.c
View File

@ -16,14 +16,12 @@
License along with TALER; see the file COPYING. If not, see License along with TALER; see the file COPYING. If not, see
<http://www.gnu.org/licenses/> <http://www.gnu.org/licenses/>
*/ */
/** /**
* @file exchange/test_bank_api_with_fakebank_twisted.c * @file exchange/test_bank_api_with_fakebank_twisted.c
* @author Marcello Stanisci * @author Marcello Stanisci
* @author Sree Harsha Totakura <sreeharsha@totakura.in> * @author Sree Harsha Totakura <sreeharsha@totakura.in>
* @author Christian Grothoff * @author Christian Grothoff
*/ */
#include "platform.h" #include "platform.h"
#include "taler_util.h" #include "taler_util.h"
#include "taler_signatures.h" #include "taler_signatures.h"
@ -77,7 +75,7 @@ run (void *cls,
{ {
struct TALER_TESTING_Command commands[] = { struct TALER_TESTING_Command commands[] = {
/** /**
* Can't use the "wait service" CMD here because the * Can't use the "wait service" CMD here because the
* fakebank runs inside the same process of the test. * fakebank runs inside the same process of the test.
@ -136,11 +134,16 @@ main (int argc,
if (NULL == (twister_url = TALER_TESTING_prepare_twister if (NULL == (twister_url = TALER_TESTING_prepare_twister
(CONFIG_FILE))) (CONFIG_FILE)))
{
GNUNET_free (fakebank_url);
return 77; return 77;
}
if (NULL == (twisterd = TALER_TESTING_run_twister (CONFIG_FILE))) if (NULL == (twisterd = TALER_TESTING_run_twister (CONFIG_FILE)))
{
GNUNET_free (twister_url);
GNUNET_free (fakebank_url);
return 77; return 77;
}
ret = TALER_TESTING_setup (&run, ret = TALER_TESTING_setup (&run,
NULL, NULL,
CONFIG_FILE, CONFIG_FILE,