summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoan Touzet <joant@atypical.net>2017-07-04 17:25:59 -0400
committerJoan Touzet <wohali@users.noreply.github.com>2017-07-05 13:00:09 -0400
commitdbe6cf733c8b7c96307dfc538bfc830556208acf (patch)
treeced54d623289ece851ddb6d335d23e6a726c8390
parent736e732ac734bacd290b894a994eed7eb4bc2dd5 (diff)
downloadcouchdb-dbe6cf733c8b7c96307dfc538bfc830556208acf.tar.gz
Fix eunit timeout option for compression tests
Closes #629
-rw-r--r--src/couch/test/couchdb_file_compression_tests.erl26
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))}}
]
}.