[taler-wallet-core] branch master updated: fix instance creation order

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository wallet-core.

The following commit(s) were added to refs/heads/master by this push:
     new 0e0d5fa3 fix instance creation order
0e0d5fa3 is described below

commit 0e0d5fa3b49e2c0065617bf78db5281322f775fa
Author: Florian Dold <florian@dold.me>
AuthorDate: Fri May 21 12:03:09 2021 +0200

    fix instance creation order
---
 packages/taler-wallet-cli/src/index.ts                      |  2 +-
 .../integrationtests/test-merchant-exchange-confusion.ts    | 13 +++++++------
 .../src/integrationtests/test-merchant-instances-delete.ts  |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/taler-wallet-cli/src/index.ts 
b/packages/taler-wallet-cli/src/index.ts
index 59b8d5c6..aad034b8 100644
--- a/packages/taler-wallet-cli/src/index.ts
+++ b/packages/taler-wallet-cli/src/index.ts
@@ -830,7 +830,7 @@ testCli
     help: "Glob pattern to select which tests to run",
   })
   .maybeOption("suites", ["--suites"], clk.STRING, {
-    help: "Only run selected suites (string-separated list)",
+    help: "Only run selected suites (comma-separated list)",
   })
   .flag("dryRun", ["--dry"], {
     help: "Only print tests that will be selected to run.",
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-merchant-exchange-confusion.ts
 
b/packages/taler-wallet-cli/src/integrationtests/test-merchant-exchange-confusion.ts
index a14b63e0..deb0026f 100644
--- 
a/packages/taler-wallet-cli/src/integrationtests/test-merchant-exchange-confusion.ts
+++ 
b/packages/taler-wallet-cli/src/integrationtests/test-merchant-exchange-confusion.ts
@@ -103,18 +103,19 @@ export async function 
createConfusedMerchantTestkudosEnvironment(
   await merchant.start();
   await merchant.pingUntilAvailable();
 
-  await merchant.addInstance({
-    id: "minst1",
-    name: "minst1",
-    paytoUris: ["payto://x-taler-bank/minst1"],
-  });
-
   await merchant.addInstance({
     id: "default",
     name: "Default Instance",
     paytoUris: [`payto://x-taler-bank/merchant-default`],
   });
 
+
+  await merchant.addInstance({
+    id: "minst1",
+    name: "minst1",
+    paytoUris: ["payto://x-taler-bank/minst1"],
+  });
+
   console.log("setup done!");
 
   const wallet = new WalletCli(t);
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts
 
b/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts
index 77e0d1bd..09353715 100644
--- 
a/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts
+++ 
b/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts
@@ -118,7 +118,7 @@ export async function runMerchantInstancesDeleteTest(t: 
GlobalTestState) {
     const exc = await t.assertThrowsAsync(async () => {
       await unauthMerchantClient.deleteInstance("myinst");
     });
-    console.log(exc);
+    console.log("Got expected exception", exc);
     t.assertAxiosError(exc);
     t.assertDeepEqual(exc.response?.status, 401);
   }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.