summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2018-07-14 13:45:37 +0200
committerGitHub <noreply@github.com>2018-07-14 13:45:37 +0200
commit6940392b7997650a68fbb31e8ac3782fe9b4d947 (patch)
tree469d4720b27585a2a63564ebf7d208befae0fa2e
parentbd6301dba80e9c093e242cd558e0f4a0456ec1be (diff)
parent1703998aeaf2aeee1a3632757d1535097fb2e898 (diff)
downloadcouchdb-fix/1197/js-tests.tar.gz
Merge branch 'master' into fix/1197/js-testsfix/1197/js-tests
-rw-r--r--src/couch/test/couchdb_attachments_tests.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/couch/test/couchdb_attachments_tests.erl b/src/couch/test/couchdb_attachments_tests.erl
index d9efac551..a85a01f48 100644
--- a/src/couch/test/couchdb_attachments_tests.erl
+++ b/src/couch/test/couchdb_attachments_tests.erl
@@ -21,9 +21,9 @@
-define(ATT_TXT_NAME, <<"file.erl">>).
-define(FIXTURE_PNG, filename:join([?FIXTURESDIR, "logo.png"])).
-define(FIXTURE_TXT, ?ABS_PATH(?FILE)).
--define(TIMEOUT, 1000).
--define(TIMEOUT_EUNIT, 10).
--define(TIMEWAIT, 100).
+-define(TIMEOUT, 5000).
+-define(TIMEOUT_EUNIT, 100).
+-define(TIMEWAIT, 1000).
-define(i2l(I), integer_to_list(I)).