diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-01 17:16:16 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-01 17:16:16 +0000 |
commit | 426b079730daf46fa69773f03b46c6bfbc231340 (patch) | |
tree | 81ff3faff65a1d348bb323df7ba28fd986b2b9e8 | |
parent | 91040069322b3b8da566118b5852a70d5169d7db (diff) | |
parent | 0abae9eeb5c0166f3364dade2c45f66c2152f94c (diff) | |
download | gitlab-ce-426b079730daf46fa69773f03b46c6bfbc231340.tar.gz |
Merge branch 'winh-raise-karma-timeout' into 'master'
Raise timeout for Karma tests to 2 seconds
See merge request gitlab-org/gitlab-ce!20963
-rw-r--r-- | spec/javascripts/test_bundle.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index e77236c40ef..5f4f4c26d74 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -98,7 +98,7 @@ let longRunningTestTimeoutHandle; beforeEach((done) => { longRunningTestTimeoutHandle = setTimeout(() => { done.fail('Test is running too long!'); - }, 1000); + }, 2000); done(); }); |