1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
|
From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Wed, 4 Nov 2020 11:32:20 +0100
Subject: fix problems raised by eslint when running tests
---
ipc/tests/subprocess-test.js | 6 +++---
package/webextension.js | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ipc/tests/subprocess-test.js b/ipc/tests/subprocess-test.js
index 5195d78..f632ca6 100644
--- a/ipc/tests/subprocess-test.js
+++ b/ipc/tests/subprocess-test.js
@@ -352,7 +352,7 @@ function run_test() {
'--pinentry-mode=loopback',
'--passphrase-fd=4',
'--status-fd=5',
- '--symmetric',
+ '--symmetric'
],
environment: envList,
stdin: function(pipe) {
@@ -377,7 +377,7 @@ function run_test() {
p.wait();
statusdata="";
- let decrypt_status_re = /\[GNUPG:\] NEED_PASSPHRASE_SYM \d+ \d+ \d+\n\[GNUPG:] BEGIN_DECRYPTION\n(\[GNUPG:\] DECRYPTION_COMPLIANCE_MODE \d+\n)?\[GNUPG:\] DECRYPTION_INFO \d+ \d+\n\[GNUPG:\] PLAINTEXT \d+ \d+ *\n(\[GNUPG:\] PLAINTEXT_LENGTH (\d+)\n)?\[GNUPG:\] DECRYPTION_OKAY\n(\[GNUPG:\] GOODMDC\n)?\[GNUPG:\] END_DECRYPTION\n/m
+ let decrypt_status_re = /\[GNUPG:\] NEED_PASSPHRASE_SYM \d+ \d+ \d+\n\[GNUPG:] BEGIN_DECRYPTION\n(\[GNUPG:\] DECRYPTION_COMPLIANCE_MODE \d+\n)?\[GNUPG:\] DECRYPTION_INFO \d+ \d+\n\[GNUPG:\] PLAINTEXT \d+ \d+ *\n(\[GNUPG:\] PLAINTEXT_LENGTH (\d+)\n)?\[GNUPG:\] DECRYPTION_OKAY\n(\[GNUPG:\] GOODMDC\n)?\[GNUPG:\] END_DECRYPTION\n/m;
try {
p = subprocess.call({
@@ -392,7 +392,7 @@ function run_test() {
'--pinentry-mode=loopback',
'--passphrase-fd=4',
'--status-fd=5',
- '--decrypt',
+ '--decrypt'
],
environment: envList,
stdin: function(pipe) {
diff --git a/package/webextension.js b/package/webextension.js
index 12eeb40..c4b3ddc 100644
--- a/package/webextension.js
+++ b/package/webextension.js
@@ -71,7 +71,7 @@ var enigmailApi = class extends ExtensionCommon.ExtensionAPI {
this.chromeHandle.destruct();
this.chromeHandle = null;
- console.debug("webextension.js: Enigmail shutdown");
+ Services.console.logStringMessage("webextension.js: Enigmail shutdown");
}
getAPI(context) {
@@ -85,7 +85,7 @@ var enigmailApi = class extends ExtensionCommon.ExtensionAPI {
}
close() {
- console.debug("webextension.js: close");
+ Services.console.logStringMessage("webextension.js: close");
ExtensionSupport.unregisterWindowListener(EXTENSION_NAME);
}
};
|