aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-06-11 11:51:55 +0200
committerChristian Grothoff <christian@grothoff.org>2017-06-11 11:51:55 +0200
commit0ef7116ecf6b772ecbcc489e2b96078d338fe9c7 (patch)
tree82d4a9133fe023faa62f28b368be996b15366e77
parent30f1d7b2440a2e5f38a75093cb771eb556fa30e6 (diff)
do not show -v option twice in -h
-rw-r--r--src/exchange/taler-exchange-wirewatch.c1
-rw-r--r--src/exchange/test_taler_exchange_wirewatch.c22
2 files changed, 13 insertions, 10 deletions
diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index aee3083f2..a3009219b 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -389,7 +389,6 @@ main (int argc,
"PLUGINNAME",
"which wire plugin to use",
&type),
- GNUNET_GETOPT_option_version (VERSION "-" VCS_VERSION),
GNUNET_GETOPT_OPTION_END
};
diff --git a/src/exchange/test_taler_exchange_wirewatch.c b/src/exchange/test_taler_exchange_wirewatch.c
index ea6f37d4a..2b13cf8dd 100644
--- a/src/exchange/test_taler_exchange_wirewatch.c
+++ b/src/exchange/test_taler_exchange_wirewatch.c
@@ -485,7 +485,7 @@ interpreter (void *cls)
"taler-exchange-wirewatch",
"taler-exchange-wirewatch",
"-c", config_filename,
- "-t", /* enable temporary tables */
+ "-t", "test",
NULL);
if (NULL == cmd->details.wirewatch.wirewatch_proc)
{
@@ -555,19 +555,25 @@ run (void *cls)
static struct Command commands[] = {
/* test running with empty DB */
{
+ .opcode = OPCODE_EXPECT_TRANSFERS_EMPTY,
+ .label = "expect-empty-transactions-on-start"
+ },
+ {
.opcode = OPCODE_RUN_AGGREGATOR,
- .label = "run-aggregator-on-empty-db"
+ .label = "run-aggregator-on-empty"
+ },
+ {
+ .opcode = OPCODE_RUN_WIREWATCH,
+ .label = "run-wirewatch-on-empty"
},
{
.opcode = OPCODE_EXPECT_TRANSFERS_EMPTY,
- .label = "expect-empty-transactions-on-start"
+ .label = "expect-empty-transactions-after-dry-run"
},
-
{
- .opcode = OPCODE_RUN_AGGREGATOR,
- .label = "run-aggregator-deposit-1"
+ .opcode = OPCODE_TERMINATE_SUCCESS,
+ .label = "testcase-complete-terminating-with-success"
},
-
{
.opcode = OPCODE_EXPECT_TRANSFER,
.label = "expect-deposit-1",
@@ -576,12 +582,10 @@ run (void *cls)
.details.expect_transfer.exchange_base_url = "https://exchange.taler.net/",
.details.expect_transfer.amount = "EUR:0.89"
},
-
{
.opcode = OPCODE_EXPECT_TRANSFERS_EMPTY,
.label = "expect-empty-transactions-on-start"
},
-
{
.opcode = OPCODE_TERMINATE_SUCCESS,
.label = "testcase-complete-terminating-with-success"