couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1097302 - in /couchdb/branches/1.0.x: ./ etc/default/couchdb test/etap/200-view-group-no-db-leaks.t
Date Thu, 28 Apr 2011 01:05:21 GMT
Author: davisp
Date: Thu Apr 28 01:05:20 2011
New Revision: 1097302

URL: http://svn.apache.org/viewvc?rev=1097302&view=rev
Log:
Make the test count for test/etap/200-*.t deterministic.

This is a backport of 1097300 from trunk.


Modified:
    couchdb/branches/1.0.x/   (props changed)
    couchdb/branches/1.0.x/etc/default/couchdb   (props changed)
    couchdb/branches/1.0.x/test/etap/200-view-group-no-db-leaks.t

Propchange: couchdb/branches/1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 28 01:05:20 2011
@@ -6,4 +6,4 @@
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
 /couchdb/tags/0.10.0:825400
-/couchdb/trunk:984170,984178,984214,984228,984237,984241,984501,991073,1045203,1095557,1095581
+/couchdb/trunk:984170,984178,984214,984228,984237,984241,984501,991073,1045203,1095557,1095581,1097300

Propchange: couchdb/branches/1.0.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 28 01:05:20 2011
@@ -6,5 +6,5 @@
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
 /couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:984170,984178,984214,984228,984237,984241,984501,991073,1045203,1095557,1095581
+/couchdb/trunk/etc/default/couchdb:984170,984178,984214,984228,984237,984241,984501,991073,1045203,1095557,1095581,1097300
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/1.0.x/test/etap/200-view-group-no-db-leaks.t
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/test/etap/200-view-group-no-db-leaks.t?rev=1097302&r1=1097301&r2=1097302&view=diff
==============================================================================
--- couchdb/branches/1.0.x/test/etap/200-view-group-no-db-leaks.t (original)
+++ couchdb/branches/1.0.x/test/etap/200-view-group-no-db-leaks.t Thu Apr 28 01:05:20 2011
@@ -65,7 +65,7 @@ ddoc_name() -> <<"foo">>.
 main(_) ->
     test_util:init_code_path(),
 
-    etap:plan(13),
+    etap:plan(11),
     case (catch test()) of
         ok ->
             etap:end_tests();
@@ -132,7 +132,7 @@ compact_db() ->
     wait_db_compact_done(10).
 
 wait_db_compact_done(0) ->
-    etap:is(true, false, "DB compaction didn't finish");
+    etap:bail("DB compaction failed to finish.");
 wait_db_compact_done(N) ->
     {ok, Db} = couch_db:open_int(test_db_name(), []),
     ok = couch_db:close(Db),
@@ -149,14 +149,17 @@ compact_view_group() ->
     wait_view_compact_done(10).
 
 wait_view_compact_done(0) ->
-    etap:is(true, false, "view group compaction didn't finish");
+    etap:bail("View group compaction failed to finish.");
 wait_view_compact_done(N) ->
     {ok, {{_, Code, _}, _Headers, Body}} = http:request(
         get,
         {db_url() ++ "/_design/" ++ binary_to_list(ddoc_name()) ++ "/_info", []},
         [],
         [{sync, true}]),
-    etap:is(Code, 200, "got view group info"),
+    case Code of
+        200 -> ok;
+        _ -> etap:bail("Invalid view group info.")
+    end,
     {Info} = couch_util:json_decode(Body),
     {IndexInfo} = couch_util:get_value(<<"view_index">>, Info),
     CompactRunning = couch_util:get_value(<<"compact_running">>, IndexInfo),



Mime
View raw message