diff options
| author | Jay Doane <jay.s.doane@gmail.com> | 2017-07-26 11:15:12 -0700 |
|---|---|---|
| committer | Joan Touzet <wohali@users.noreply.github.com> | 2017-07-26 15:02:58 -0400 |
| commit | d2813b02db9f732833f1de501c170f488b2242fe (patch) | |
| tree | 74c4be453cb466f98947c40e3dbf75dcfdcf6ed7 | |
| parent | 439e642363cbb7bbc299b844df211e849aa667a8 (diff) | |
| download | couchdb-d2813b02db9f732833f1de501c170f488b2242fe.tar.gz | |
Increase various eunit test timeouts
Several eunit tests tend to fail by timing out when run on
travis-ci. This change increases timeouts on the more commonly failing
tests, and improves test robustness.
6 files changed, 7 insertions, 6 deletions
diff --git a/src/couch/test/couch_changes_tests.erl b/src/couch/test/couch_changes_tests.erl index d0fae1a99..b2da3fea4 100644 --- a/src/couch/test/couch_changes_tests.erl +++ b/src/couch/test/couch_changes_tests.erl @@ -15,7 +15,7 @@ -include_lib("couch/include/couch_eunit.hrl"). -include_lib("couch/include/couch_db.hrl"). --define(TIMEOUT, 3000). +-define(TIMEOUT, 6000). -define(TEST_TIMEOUT, 10000). -record(row, { diff --git a/src/couch/test/couchdb_file_compression_tests.erl b/src/couch/test/couchdb_file_compression_tests.erl index 935638614..09fead582 100644 --- a/src/couch/test/couchdb_file_compression_tests.erl +++ b/src/couch/test/couchdb_file_compression_tests.erl @@ -17,7 +17,7 @@ -define(DDOC_ID, <<"_design/test">>). -define(DOCS_COUNT, 5000). --define(TIMEOUT, 30000). +-define(TIMEOUT, 60000). setup() -> config:set("couchdb", "file_compression", "none", false), diff --git a/src/couch/test/couchdb_os_daemons_tests.erl b/src/couch/test/couchdb_os_daemons_tests.erl index b22bc5efd..1728314bb 100644 --- a/src/couch/test/couchdb_os_daemons_tests.erl +++ b/src/couch/test/couchdb_os_daemons_tests.erl @@ -38,7 +38,7 @@ -define(DAEMON_CAN_REBOOT, "os_daemon_can_reboot.sh"). -define(DAEMON_DIE_ON_BOOT, "os_daemon_die_on_boot.sh"). -define(DAEMON_DIE_QUICKLY, "os_daemon_die_quickly.sh"). --define(TRIES, 20). +-define(TRIES, 40). -define(TRY_DELAY_MS, 100). -define(TIMEOUT, 10000). -define(CONFIG_TIMEOUT, 1000). diff --git a/src/couch/test/couchdb_update_conflicts_tests.erl b/src/couch/test/couchdb_update_conflicts_tests.erl index 1f810f384..09c2834a8 100644 --- a/src/couch/test/couchdb_update_conflicts_tests.erl +++ b/src/couch/test/couchdb_update_conflicts_tests.erl @@ -18,7 +18,7 @@ -define(i2l(I), integer_to_list(I)). -define(DOC_ID, <<"foobar">>). -define(NUM_CLIENTS, [100, 500, 1000, 2000, 5000, 10000]). --define(TIMEOUT, 10000). +-define(TIMEOUT, 20000). start() -> Ctx = test_util:start_couch(), diff --git a/src/couch/test/couchdb_views_tests.erl b/src/couch/test/couchdb_views_tests.erl index 65fc2b385..ae4029513 100644 --- a/src/couch/test/couchdb_views_tests.erl +++ b/src/couch/test/couchdb_views_tests.erl @@ -18,6 +18,7 @@ -define(DELAY, 100). -define(TIMEOUT, 1000). +-define(WAIT_DELAY_COUNT, 40). setup() -> DbName = ?tempdb(), @@ -565,7 +566,7 @@ compact_db(DbName) -> {ok, Db} = couch_db:open_int(DbName, []), {ok, _} = couch_db:start_compact(Db), ok = couch_db:close(Db), - wait_db_compact_done(DbName, 20). + wait_db_compact_done(DbName, ?WAIT_DELAY_COUNT). wait_db_compact_done(_DbName, 0) -> erlang:error({assertion_failed, diff --git a/src/couch_replicator/test/couch_replicator_small_max_request_size_target.erl b/src/couch_replicator/test/couch_replicator_small_max_request_size_target.erl index 99f5723bd..b0b867a5d 100644 --- a/src/couch_replicator/test/couch_replicator_small_max_request_size_target.erl +++ b/src/couch_replicator/test/couch_replicator_small_max_request_size_target.erl @@ -9,7 +9,7 @@ compare_dbs/3 ]). --define(TIMEOUT_EUNIT, 180). +-define(TIMEOUT_EUNIT, 360). setup() -> |