diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-08-09 10:33:21 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-08-09 10:33:21 +0200 |
commit | f17ad4de768e297879a6ace43f7be723ddff6b6f (patch) | |
tree | 906297edbe737f96028187d444f4d261257a4f91 /src/benchmark | |
parent | 4693708b8c53471f7bc5e956dff8158615c46deb (diff) | |
download | exchange-f17ad4de768e297879a6ace43f7be723ddff6b6f.tar.xz |
in parallel tests, only launch one exchange -- still broken: code attempts to launch multiple fakebanks
Diffstat (limited to 'src/benchmark')
-rw-r--r-- | src/benchmark/exchange_benchmark_home/.config/taler/account-2.json | 4 | ||||
-rw-r--r-- | src/benchmark/taler-exchange-benchmark.c | 47 |
2 files changed, 33 insertions, 18 deletions
diff --git a/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json b/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json index dabd5092f..b320bd946 100644 --- a/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json +++ b/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json @@ -1,5 +1,5 @@ { "url": "payto://x-taler-bank/localhost:8082/2", - "salt": "V7S6Y75HPSFGKXET03NHS3SDEST5Q0XNX9WYCXRRRNRHPBVSD86Y1A7ZR5KR7105JN3XDBTKWDD3WQZ9XA2MJKD020APECA0P61FFBG", - "master_sig": "H61WAQKG8F9W25SZNVF1JPNYG0BFYXPN65D936TT44ZC0JT849R8YNC0CFPJBQX77EW51DCR0864DC82A4J2AF7H55DSVVMWVYEZR1R" + "salt": "NYZ2WR8CPT5PB58X10EZDJDY3MSWHAHTD0M99JJH54Z0A916NTX4P4AF5Y3KPGRYEVX3TV7J2ZG6PKZSKFYMSKMHCN83ZT3V2216YP8", + "master_sig": "0RF7GBGKGJQ0ZQVP0HJ516CC882RV6HVJZABN5S1YMF6WD94QJJRZSTFB669QTNW63DPRP0YYJ0RGCNXA3AHQ1HGYDGAMZX0S983020" }
\ No newline at end of file diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c index 5039a96f5..a5528fff5 100644 --- a/src/benchmark/taler-exchange-benchmark.c +++ b/src/benchmark/taler-exchange-benchmark.c @@ -327,7 +327,6 @@ run (void *cls, struct TALER_Amount total_reserve_amount; struct TALER_Amount withdraw_fee; char *withdraw_fee_str; - struct TALER_TESTING_Command all_commands [1 + /* Withdraw block */ howmany_coins + /* All units */ @@ -353,19 +352,14 @@ run (void *cls, TALER_amount_add (&total_reserve_amount, &total_reserve_amount, &withdraw_fee); - struct TALER_TESTING_Command make_reserve[] = { - CMD_TRANSFER_TO_EXCHANGE ("create-reserve", TALER_amount_to_string (&total_reserve_amount)), - TALER_TESTING_cmd_exec_wirewatch ("wirewatch", cfg_filename), - TALER_TESTING_cmd_end () - }; all_commands[0] = TALER_TESTING_cmd_batch ("make-reserve", @@ -379,18 +373,15 @@ run (void *cls, GNUNET_asprintf (&withdraw_label, "withdraw-%u", i); - GNUNET_asprintf (&order_enc, "{\"nonce\": %u}", i); - unit[0] = TALER_TESTING_cmd_withdraw_amount (withdraw_label, is->exchange, "create-reserve", AMOUNT_5, MHD_HTTP_OK); - unit[1] = TALER_TESTING_cmd_deposit ("deposit", is->exchange, @@ -424,22 +415,20 @@ run (void *cls, AMOUNT_4, withdraw_label, MHD_HTTP_OK); - unit[3] = TALER_TESTING_cmd_refresh_reveal (reveal_label, is->exchange, melt_label, MHD_HTTP_OK); - unit[4] = TALER_TESTING_cmd_refresh_link ("refresh-link", is->exchange, reveal_label, MHD_HTTP_OK); - unit[5] = TALER_TESTING_cmd_end (); } - else unit[2] = TALER_TESTING_cmd_end (); + else + unit[2] = TALER_TESTING_cmd_end (); all_commands[1 + i] = TALER_TESTING_cmd_batch ("unit", unit); @@ -473,17 +462,37 @@ parallel_benchmark (TALER_TESTING_Main main_cb, int result; pid_t cpids[howmany_clients]; int wstatus; - + struct GNUNET_OS_Process *exchanged; + + exchanged = GNUNET_OS_start_process (GNUNET_NO, + GNUNET_OS_INHERIT_STD_ALL, + NULL, NULL, NULL, + "taler-exchange-httpd", + "taler-exchange-httpd", + "-c", config_file, + "-i", + NULL); + if (NULL == exchanged) + return GNUNET_SYSERR; + if (0 != TALER_TESTING_wait_exchange_ready (exchange_url)) + { + GNUNET_OS_process_kill (exchanged, + SIGTERM); + GNUNET_OS_process_wait (exchanged); + GNUNET_OS_process_destroy (exchanged); + return 77; + } result = GNUNET_OK; for (unsigned int i=0;i<howmany_clients;i++) { if (0 == (cpids[i] = fork ())) { /* I am the child, do the work! */ - result = TALER_TESTING_setup_with_exchange + result = TALER_TESTING_setup (run, NULL, - cfg_filename); + cfg_filename, + exchanged); if (GNUNET_OK == result) exit (0); else @@ -509,6 +518,12 @@ parallel_benchmark (TALER_TESTING_Main main_cb, (0 != WEXITSTATUS (wstatus)) ) result = GNUNET_SYSERR; } + GNUNET_break (0 == + GNUNET_OS_process_kill (exchanged, + SIGTERM)); + GNUNET_break (GNUNET_OK == + GNUNET_OS_process_wait (exchanged)); + GNUNET_OS_process_destroy (exchanged); return result; } |