aboutsummaryrefslogtreecommitdiffstats
path: root/lang/js/BrowserTestExtension
diff options
context:
space:
mode:
authorMaximilian Krambach <[email protected]>2018-09-19 08:56:36 +0000
committerMaximilian Krambach <[email protected]>2018-09-19 08:56:36 +0000
commit7f149586062ebae8114f64078771cb25579f5003 (patch)
treeafb8f87c0a8195ce8cf320115edc80019c9fd0af /lang/js/BrowserTestExtension
parentdocs: python bindings (diff)
downloadgpgme-7f149586062ebae8114f64078771cb25579f5003.tar.gz
gpgme-7f149586062ebae8114f64078771cb25579f5003.zip
js: add configuration option on startup
-- * src/index.js: Added an optional configuration object for the startup. * configuration: timeout - the initial check for a connection ran into timeouts on slower testing machines. 500ms for initial startup is not sufficient everywhere. The default timeout was raised to 1000ms, and as an option this timeout can be increased even further. * BrowsertestExtension: Set the initial connection timeouts to 2 seconds, to be able to test on slower machines.
Diffstat (limited to 'lang/js/BrowserTestExtension')
-rw-r--r--lang/js/BrowserTestExtension/tests/KeyImportExport.js2
-rw-r--r--lang/js/BrowserTestExtension/tests/KeyInfos.js2
-rw-r--r--lang/js/BrowserTestExtension/tests/decryptTest.js2
-rw-r--r--lang/js/BrowserTestExtension/tests/encryptDecryptTest.js2
-rw-r--r--lang/js/BrowserTestExtension/tests/encryptTest.js2
-rw-r--r--lang/js/BrowserTestExtension/tests/longRunningTests.js2
-rw-r--r--lang/js/BrowserTestExtension/tests/signTest.js2
-rw-r--r--lang/js/BrowserTestExtension/tests/startup.js2
-rw-r--r--lang/js/BrowserTestExtension/tests/verifyTest.js2
9 files changed, 9 insertions, 9 deletions
diff --git a/lang/js/BrowserTestExtension/tests/KeyImportExport.js b/lang/js/BrowserTestExtension/tests/KeyImportExport.js
index f57877f4..b3d95bbc 100644
--- a/lang/js/BrowserTestExtension/tests/KeyImportExport.js
+++ b/lang/js/BrowserTestExtension/tests/KeyImportExport.js
@@ -32,7 +32,7 @@ describe('Key importing', function () {
let context = null;
before(function (done){
- const prm = Gpgmejs.init();
+ const prm = Gpgmejs.init({ timeout: 2000 });
prm.then(function (gpgmejs){
context = gpgmejs;
context.Keyring.getKeys({ pattern: fpr }).then(
diff --git a/lang/js/BrowserTestExtension/tests/KeyInfos.js b/lang/js/BrowserTestExtension/tests/KeyInfos.js
index 553aedb9..d1229584 100644
--- a/lang/js/BrowserTestExtension/tests/KeyInfos.js
+++ b/lang/js/BrowserTestExtension/tests/KeyInfos.js
@@ -27,7 +27,7 @@
describe('Key information', function () {
let context = null;
before(function (done){
- const prm = Gpgmejs.init();
+ const prm = Gpgmejs.init({ timeout: 2000 });
prm.then(function (gpgmejs){
context = gpgmejs;
done();
diff --git a/lang/js/BrowserTestExtension/tests/decryptTest.js b/lang/js/BrowserTestExtension/tests/decryptTest.js
index 61a3fab9..5817eb49 100644
--- a/lang/js/BrowserTestExtension/tests/decryptTest.js
+++ b/lang/js/BrowserTestExtension/tests/decryptTest.js
@@ -29,7 +29,7 @@ describe('Decryption', function () {
const good_fpr = inputvalues.encrypt.good.fingerprint;
before(function (done){
- const prm = Gpgmejs.init();
+ const prm = Gpgmejs.init({ timeout:2000 });
prm.then(function (gpgmejs){
context = gpgmejs;
done();
diff --git a/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js b/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js
index c10c5d06..b4e4f3fb 100644
--- a/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js
+++ b/lang/js/BrowserTestExtension/tests/encryptDecryptTest.js
@@ -29,7 +29,7 @@ describe('Encryption and Decryption', function (){
let good_fpr = inputvalues.encrypt.good.fingerprint;
before(function (done){
- const prm = Gpgmejs.init();
+ const prm = Gpgmejs.init({ timeout: 2000 });
prm.then(function (gpgmejs){
context = gpgmejs;
done();
diff --git a/lang/js/BrowserTestExtension/tests/encryptTest.js b/lang/js/BrowserTestExtension/tests/encryptTest.js
index d97b458d..1017d714 100644
--- a/lang/js/BrowserTestExtension/tests/encryptTest.js
+++ b/lang/js/BrowserTestExtension/tests/encryptTest.js
@@ -28,7 +28,7 @@ describe('Encryption', function () {
let context = null;
const good_fpr = inputvalues.encrypt.good.fingerprint;
before(function (done){
- const prm = Gpgmejs.init();
+ const prm = Gpgmejs.init({ timeout: 2000 });
prm.then(function (gpgmejs){
context = gpgmejs;
done();
diff --git a/lang/js/BrowserTestExtension/tests/longRunningTests.js b/lang/js/BrowserTestExtension/tests/longRunningTests.js
index f28a6e78..534a95aa 100644
--- a/lang/js/BrowserTestExtension/tests/longRunningTests.js
+++ b/lang/js/BrowserTestExtension/tests/longRunningTests.js
@@ -27,7 +27,7 @@ describe('Long running Encryption/Decryption', function () {
let context = null;
const good_fpr = inputvalues.encrypt.good.fingerprint;
before(function (done){
- const prm = Gpgmejs.init();
+ const prm = Gpgmejs.init({ timeout: 2000 });
prm.then(function (gpgmejs){
context = gpgmejs;
done();
diff --git a/lang/js/BrowserTestExtension/tests/signTest.js b/lang/js/BrowserTestExtension/tests/signTest.js
index bd8db807..1e269e6a 100644
--- a/lang/js/BrowserTestExtension/tests/signTest.js
+++ b/lang/js/BrowserTestExtension/tests/signTest.js
@@ -29,7 +29,7 @@ describe('Signing', function () {
const good_fpr = inputvalues.encrypt.good.fingerprint;
before(function (done){
- const prm = Gpgmejs.init();
+ const prm = Gpgmejs.init({ timeout: 2000 });
prm.then(function (gpgmejs){
context = gpgmejs;
done();
diff --git a/lang/js/BrowserTestExtension/tests/startup.js b/lang/js/BrowserTestExtension/tests/startup.js
index cf5b0999..e7c74782 100644
--- a/lang/js/BrowserTestExtension/tests/startup.js
+++ b/lang/js/BrowserTestExtension/tests/startup.js
@@ -25,7 +25,7 @@
describe('GPGME context', function (){
it('Starting a GpgME instance', function (done){
- let prm = Gpgmejs.init();
+ let prm = Gpgmejs.init({ timeout: 2000 });
const input = inputvalues.someInputParameter;
prm.then(
function (context){
diff --git a/lang/js/BrowserTestExtension/tests/verifyTest.js b/lang/js/BrowserTestExtension/tests/verifyTest.js
index 04c7a77a..c63f6849 100644
--- a/lang/js/BrowserTestExtension/tests/verifyTest.js
+++ b/lang/js/BrowserTestExtension/tests/verifyTest.js
@@ -28,7 +28,7 @@
describe('Verifying data', function () {
let context = null;
before(function (done){
- const prm = Gpgmejs.init();
+ const prm = Gpgmejs.init({ timeout: 2000 });
prm.then(function (gpgmejs){
context = gpgmejs;
done();