gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-wallet-core] branch master updated (e79a118a -> b4a4a9e2)


From: gnunet
Subject: [taler-wallet-core] branch master updated (e79a118a -> b4a4a9e2)
Date: Fri, 07 Aug 2020 08:06:39 +0200

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

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

    from e79a118a Run new integration tests in CI
     new 32755f54 only shut down once
     new b4a4a9e2 log file location

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 packages/taler-integrationtests/src/harness.ts               | 12 ++++++++----
 packages/taler-integrationtests/src/merchantApiTypes.ts      |  3 +++
 packages/taler-integrationtests/src/test-payment-multiple.ts |  2 +-
 packages/taler-integrationtests/src/test-payment.ts          |  2 +-
 packages/taler-integrationtests/src/test-withdrawal.ts       |  2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/taler-integrationtests/src/harness.ts 
b/packages/taler-integrationtests/src/harness.ts
index ec25ca25..8a2436a4 100644
--- a/packages/taler-integrationtests/src/harness.ts
+++ b/packages/taler-integrationtests/src/harness.ts
@@ -220,6 +220,7 @@ export class GlobalTestState {
   testDir: string;
   procs: ProcessWrapper[];
   servers: http.Server[];
+  inShutdown: false;
   constructor(params: GlobalTestParams) {
     this.testDir = params.testDir;
     this.procs = [];
@@ -307,8 +308,11 @@ export class GlobalTestState {
     return procWrap;
   }
 
-  async terminate(): Promise<void> {
-    console.log("terminating");
+  async shutdown(): Promise<void> {
+    if (this.inShutdown) {
+      return;
+    }
+    console.log("shutting down");
     for (const s of this.servers) {
       s.close();
       s.removeAllListeners();
@@ -879,7 +883,7 @@ export function runTest(testMain: (gc: GlobalTestState) => 
Promise<void>) {
     let ret = 0;
     try {
       gc = new GlobalTestState({
-        testDir: fs.mkdtempSync("taler-integrationtest-"),
+        testDir: fs.mkdtempSync(path.join(os.tmpdir(), 
"taler-integrationtest-")),
       });
       updateCurrentSymlink(gc.testDir);
       await testMain(gc);
@@ -892,7 +896,7 @@ export function runTest(testMain: (gc: GlobalTestState) => 
Promise<void>) {
           console.log("test logs and config can be found under", gc.testDir);
           console.log("keeping test environment running");
         } else {
-          await gc.terminate();
+          await gc.shutdown();
           console.log("test logs and config can be found under", gc.testDir);
           process.exit(ret);
         }
diff --git a/packages/taler-integrationtests/src/merchantApiTypes.ts 
b/packages/taler-integrationtests/src/merchantApiTypes.ts
index 412b9bb8..fe70c356 100644
--- a/packages/taler-integrationtests/src/merchantApiTypes.ts
+++ b/packages/taler-integrationtests/src/merchantApiTypes.ts
@@ -93,6 +93,7 @@ export const codecForCheckPaymentUnpaidResponse = (): 
codec.Codec<
     .makeCodecForObject<CheckPaymentUnpaidResponse>()
     .property("order_status", codec.makeCodecForConstString("unpaid"))
     .property("taler_pay_uri", codec.codecForString)
+    .property("order_status_url", codec.codecForString)
     .property(
       "already_paid_order_id",
       codec.makeCodecOptional(codec.codecForString),
@@ -161,6 +162,8 @@ export interface CheckPaymentUnpaidResponse {
   // URI that the wallet must process to complete the payment.
   taler_pay_uri: string;
 
+  order_status_url: string;
+
   // Alternative order ID which was paid for already in the same session.
   // Only given if the same product was purchased before in the same session.
   already_paid_order_id?: string;
diff --git a/packages/taler-integrationtests/src/test-payment-multiple.ts 
b/packages/taler-integrationtests/src/test-payment-multiple.ts
index b92513d4..2914b718 100644
--- a/packages/taler-integrationtests/src/test-payment-multiple.ts
+++ b/packages/taler-integrationtests/src/test-payment-multiple.ts
@@ -137,5 +137,5 @@ runTest(async (t: GlobalTestState) => {
 
   t.assertTrue(orderStatus.order_status === "paid");
 
-  await t.terminate();
+  await t.shutdown();
 });
diff --git a/packages/taler-integrationtests/src/test-payment.ts 
b/packages/taler-integrationtests/src/test-payment.ts
index fe44c183..cfe65a6f 100644
--- a/packages/taler-integrationtests/src/test-payment.ts
+++ b/packages/taler-integrationtests/src/test-payment.ts
@@ -76,5 +76,5 @@ runTest(async (t: GlobalTestState) => {
 
   t.assertTrue(orderStatus.order_status === "paid");
 
-  await t.terminate();
+  await t.shutdown();
 });
diff --git a/packages/taler-integrationtests/src/test-withdrawal.ts 
b/packages/taler-integrationtests/src/test-withdrawal.ts
index 67720a8a..a856560d 100644
--- a/packages/taler-integrationtests/src/test-withdrawal.ts
+++ b/packages/taler-integrationtests/src/test-withdrawal.ts
@@ -64,5 +64,5 @@ runTest(async (t: GlobalTestState) => {
   const balResp = 
walletTypes.codecForBalancesResponse().decode(balApiResp.result);
   t.assertAmountEquals("TESTKUDOS:9.72", balResp.balances[0].available)
 
-  await t.terminate();
+  await t.shutdown();
 });

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]