couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [37/48] couch commit: updated refs/heads/master to 7776921
Date Sat, 04 Apr 2015 23:29:32 GMT
Enable couchdb_update_conflicts_tests

COUCHDB-2547


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/65c88d2d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/65c88d2d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/65c88d2d

Branch: refs/heads/master
Commit: 65c88d2dfb386cc0a13df26a59b8e89b93e440c0
Parents: 3776aa3
Author: ILYA Khlopotov <iilyak@ca.ibm.com>
Authored: Thu Feb 5 11:30:15 2015 -0800
Committer: ILYA Khlopotov <iilyak@ca.ibm.com>
Committed: Tue Feb 10 11:07:22 2015 -0800

----------------------------------------------------------------------
 test/couchdb_update_conflicts_tests.erl | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/65c88d2d/test/couchdb_update_conflicts_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb_update_conflicts_tests.erl b/test/couchdb_update_conflicts_tests.erl
index 3409f83..1f810f3 100644
--- a/test/couchdb_update_conflicts_tests.erl
+++ b/test/couchdb_update_conflicts_tests.erl
@@ -20,9 +20,6 @@
 -define(NUM_CLIENTS, [100, 500, 1000, 2000, 5000, 10000]).
 -define(TIMEOUT, 10000).
 
-
--ifdef(run_broken_tests).
-
 start() ->
     Ctx = test_util:start_couch(),
     config:set("couchdb", "delayed_commits", "true", false),
@@ -213,8 +210,8 @@ bulk_delete_create(DbName, InitRev) ->
 
     %% Deleted revision has position 2
     ?assertEqual(2, element(1, Rev1)),
-    %% New leaf revision has position 1
-    ?assertEqual(1, element(1, Rev2)).
+    %% New leaf revision has position 3
+    ?assertEqual(3, element(1, Rev2)).
 
 
 spawn_client(DbName, Doc) ->
@@ -232,5 +229,3 @@ spawn_client(DbName, Doc) ->
         ok = couch_db:close(Db),
         exit(Result)
     end).
-
--endif.


Mime
View raw message