couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chewbra...@apache.org
Subject [1/4] fabric commit: updated refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed to 4f9cc9e
Date Wed, 28 May 2014 22:46:43 GMT
Repository: couchdb-fabric
Updated Branches:
  refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed 78a98aee1 -> 4f9cc9e44
(forced update)


Fix meck expectations


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/355937d0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/355937d0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/355937d0

Branch: refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed
Commit: 355937d003edf177fc7c7ece5bf3f4e9b7cdebe7
Parents: 8fe2ee6
Author: Robert Newson <rnewson@apache.org>
Authored: Fri May 23 17:44:04 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Fri May 23 17:44:04 2014 +0100

----------------------------------------------------------------------
 src/fabric_doc_open.erl      | 8 ++++----
 src/fabric_doc_open_revs.erl | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/355937d0/src/fabric_doc_open.erl
----------------------------------------------------------------------
diff --git a/src/fabric_doc_open.erl b/src/fabric_doc_open.erl
index 1562fd8..77b6337 100644
--- a/src/fabric_doc_open.erl
+++ b/src/fabric_doc_open.erl
@@ -379,7 +379,7 @@ handle_message_reply_test() ->
 
 read_repair_test() ->
     start_meck_(),
-    meck:expect(twig, log, fun(_, _, _) -> ok end),
+    meck:expect(couch_log, notice, fun(_, _) -> ok end),
 
     Foo1 = {ok, #doc{revs = {1,[<<"foo">>]}}},
     Foo2 = {ok, #doc{revs = {2,[<<"foo2">>,<<"foo">>]}}},
@@ -417,7 +417,7 @@ read_repair_test() ->
 
 handle_response_quorum_met_test() ->
     start_meck_(),
-    meck:expect(twig, log, fun(_, _, _) -> ok end),
+    meck:expect(couch_log, notice, fun(_, _) -> ok end),
     meck:expect(fabric, update_docs, fun(_, _, _) -> {ok, []} end),
 
     Foo1 = {ok, #doc{revs = {1,[<<"foo">>]}}},
@@ -464,7 +464,7 @@ handle_response_quorum_met_test() ->
 
 
 start_meck_() ->
-    meck:new([twig, rexi, fabric]).
+    meck:new([couch_log, rexi, fabric]).
 
 stop_meck_() ->
-    meck:unload([twig, rexi, fabric]).
+    meck:unload([couch_log, rexi, fabric]).

http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/355937d0/src/fabric_doc_open_revs.erl
----------------------------------------------------------------------
diff --git a/src/fabric_doc_open_revs.erl b/src/fabric_doc_open_revs.erl
index 38f69b9..662990a 100644
--- a/src/fabric_doc_open_revs.erl
+++ b/src/fabric_doc_open_revs.erl
@@ -187,7 +187,6 @@ unstrip_not_found_missing([Else | Rest]) ->
 all_revs_test() ->
     config:start_link([]),
     meck:new(fabric),
-    meck:expect(fabric, dbname, fun(Name) -> Name end),
     meck:expect(fabric, update_docs, fun(_, _, _) -> {ok, nil} end),
     State0 = #state{worker_count = 3, workers=[nil,nil,nil], r = 2, revs = all},
     Foo1 = {ok, #doc{revs = {1, [<<"foo">>]}}},
@@ -238,7 +237,6 @@ all_revs_test() ->
 specific_revs_test() ->
     config:start_link([]),
     meck:new(fabric),
-    meck:expect(fabric, dbname, fun(Name) -> Name end),
     meck:expect(fabric, update_docs, fun(_, _, _) -> {ok, nil} end),
     Revs = [{1,<<"foo">>}, {1,<<"bar">>}, {1,<<"baz">>}],
     State0 = #state{


Mime
View raw message