You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2017/07/05 17:00:11 UTC

[couchdb] branch master updated: Fix eunit timeout option for compression tests

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/master by this push:
     new dbe6cf7  Fix eunit timeout option for compression tests
dbe6cf7 is described below

commit dbe6cf733c8b7c96307dfc538bfc830556208acf
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Tue Jul 4 17:25:59 2017 -0400

    Fix eunit timeout option for compression tests
    
    Closes #629
---
 src/couch/test/couchdb_file_compression_tests.erl | 26 +++++++++++++++--------
 1 file 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 a91a924..ccfa244 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))}}
         ]
     }.
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].