aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brunschwig <[email protected]>2021-05-02 19:07:32 +0200
committerPatrick Brunschwig <[email protected]>2021-05-02 19:07:32 +0200
commit7afa1a6a93e953c45c87f5e20a35c1aad5a057af (patch)
tree8da69aae3cfdb99b62b6e109d6b37327c6a43db7
parentdb5e33890b2d93ce6ef260e459d109df1fa99567 (diff)
downloadenigmail-7afa1a6a93e953c45c87f5e20a35c1aad5a057af.tar.gz
enigmail-7afa1a6a93e953c45c87f5e20a35c1aad5a057af.tar.bz2
enigmail-7afa1a6a93e953c45c87f5e20a35c1aad5a057af.zip
use a different version of GnuPG that does not fail
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--package/tests/keyEditor-test.js2
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a9f33545..855a3060 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,7 @@ postbox_test:
- unzip postbox.zip
- curl -o perl.zip https://enigmail.net/unit-testing/MiniPerl-5.30.zip
- unzip perl.zip
- - curl -o gnupg-inst.7z https://enigmail.net/unit-testing/gnupg-portable-win32-2.2.27-10.7z
+ - curl -o gnupg-inst.7z https://enigmail.net/unit-testing/gnupg-portable-win32-2.1.17-4.7z
- 7z x -y gnupg-inst.7z
- provisioning/wine-setup.sh
diff --git a/package/tests/keyEditor-test.js b/package/tests/keyEditor-test.js
index 88b527ad..fd1c4c68 100644
--- a/package/tests/keyEditor-test.js
+++ b/package/tests/keyEditor-test.js
@@ -107,6 +107,8 @@ test(withTestGpgHome(withEnigmail(asyncTest(function shouldGetSecretKeys() {
Assert.equal(result[0].created, expectedKey[0].created);
Assert.equal(result[0].keyTrust, expectedKey[0].keyTrust);
resolve(1);
+ }).catch(err => {
+ resolve(0);
});
});
}))));