diff options
author | Joan Touzet <joant@atypical.net> | 2017-07-04 17:25:59 -0400 |
---|---|---|
committer | Joan Touzet <joant@atypical.net> | 2017-07-04 17:25:59 -0400 |
commit | f08cb8cf244e0b56eef12f3583546e6a25d4fa28 (patch) | |
tree | 47d2ee7892663fe27d36c7ab6259e7f7a662140f | |
parent | 409ea971d8272adbc3d4d51b42df698d0dfb9d32 (diff) | |
download | couchdb-629-fix-compression-timeout.tar.gz |
Fix eunit timeout option for compression tests629-fix-compression-timeout
Closes #629
-rw-r--r-- | src/couch/test/couchdb_file_compression_tests.erl | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/couch/test/couchdb_file_compression_tests.erl b/src/couch/test/couchdb_file_compression_tests.erl index a91a92447..ccfa24435 100644 --- a/src/couch/test/couchdb_file_compression_tests.erl +++ b/src/couch/test/couchdb_file_compression_tests.erl @@ -44,7 +44,7 @@ teardown(DbName) -> ok. -couch_auth_cache_test_() -> +couch_file_compression_test_() -> { "CouchDB file compression tests", { @@ -70,8 +70,10 @@ should_use_none(DbName) -> { "Use no compression", [ - {"compact database", ?_test(compact_db(DbName))}, - {"compact view", ?_test(compact_view(DbName))} + {"compact database", + {timeout, 5 + ?TIMEOUT div 1000, ?_test(compact_db(DbName))}}, + {"compact view", + {timeout, 5 + ?TIMEOUT div 1000, ?_test(compact_view(DbName))}} ] }. @@ -80,8 +82,10 @@ should_use_deflate_1(DbName) -> { "Use deflate compression at level 1", [ - {"compact database", ?_test(compact_db(DbName))}, - {"compact view", ?_test(compact_view(DbName))} + {"compact database", + {timeout, 5 + ?TIMEOUT div 1000, ?_test(compact_db(DbName))}}, + {"compact view", + {timeout, 5 + ?TIMEOUT div 1000, ?_test(compact_view(DbName))}} ] }. @@ -90,8 +94,10 @@ should_use_deflate_9(DbName) -> { "Use deflate compression at level 9", [ - {"compact database", ?_test(compact_db(DbName))}, - {"compact view", ?_test(compact_view(DbName))} + {"compact database", + {timeout, 5 + ?TIMEOUT div 1000, ?_test(compact_db(DbName))}}, + {"compact view", + {timeout, 5 + ?TIMEOUT div 1000, ?_test(compact_view(DbName))}} ] }. @@ -100,8 +106,10 @@ should_use_snappy(DbName) -> { "Use snappy compression", [ - {"compact database", ?_test(compact_db(DbName))}, - {"compact view", ?_test(compact_view(DbName))} + {"compact database", + {timeout, 5 + ?TIMEOUT div 1000, ?_test(compact_db(DbName))}}, + {"compact view", + {timeout, 5 + ?TIMEOUT div 1000, ?_test(compact_view(DbName))}} ] }. |