You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/04/05 01:29:38 UTC
[43/48] couch commit: updated refs/heads/master to 7776921
Comment out test case for disabled functionality
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/c448b142
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/c448b142
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/c448b142
Branch: refs/heads/master
Commit: c448b142e0f02660862d856f4bcd8cc243e8168b
Parents: b41d8ba
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Thu Feb 19 10:05:21 2015 -0800
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Thu Feb 19 10:05:21 2015 -0800
----------------------------------------------------------------------
src/couch_auth_cache.erl | 2 +-
src/couch_proc_manager.erl | 2 +-
src/test_util.erl | 19 +++++++++----------
test/couch_changes_tests.erl | 2 --
test/couch_task_status_tests.erl | 20 ++++++++++----------
5 files changed, 21 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c448b142/src/couch_auth_cache.erl
----------------------------------------------------------------------
diff --git a/src/couch_auth_cache.erl b/src/couch_auth_cache.erl
index a8fdab8..c936535 100644
--- a/src/couch_auth_cache.erl
+++ b/src/couch_auth_cache.erl
@@ -232,7 +232,7 @@ handle_info(restart_event_listener, State) ->
?MODULE, handle_db_event, nil, [{dbname, AuthDbName}]
),
{noreply, State#state{event_listener=NewListener}};
-handle_info({'DOWN', Ref, _, _, shutdown}, State) ->
+handle_info({'DOWN', _Ref, _, _, shutdown}, State) ->
{stop, shutdown, State};
handle_info({'DOWN', Ref, _, _, _Reason}, #state{db_mon_ref = Ref} = State) ->
{noreply, reinit_cache(State)};
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c448b142/src/couch_proc_manager.erl
----------------------------------------------------------------------
diff --git a/src/couch_proc_manager.erl b/src/couch_proc_manager.erl
index 20514cc..b3ca69a 100644
--- a/src/couch_proc_manager.erl
+++ b/src/couch_proc_manager.erl
@@ -457,7 +457,7 @@ return_proc(#state{} = State, #proc_int{} = ProcInt) ->
flush_waiters(NewState, Lang).
maybe_assign_proc(#state{} = State, ProcInt) ->
- #proc_int{pid = Pid, lang = Lang} = ProcInt,
+ #proc_int{lang = Lang} = ProcInt,
case get_waiting_client(Lang) of
#client{from = From} = Client ->
Proc = assign_proc(Client, ProcInt#proc_int{client=undefined}),
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c448b142/src/test_util.erl
----------------------------------------------------------------------
diff --git a/src/test_util.erl b/src/test_util.erl
index 829fc36..f0ef82a 100644
--- a/src/test_util.erl
+++ b/src/test_util.erl
@@ -92,16 +92,15 @@ start_applications(Apps) ->
start_applications([], Acc) ->
lists:reverse(Acc);
start_applications([App|Apps], Acc) ->
- NewAcc =
- case application:start(App) of
- {error, {already_started, _}} ->
- start_applications(Apps, Acc);
- {error, {not_started, Dep}} ->
- start_applications([Dep, App | Apps], Acc);
- {error, {not_running, Dep}} ->
- start_applications([Dep, App | Apps], Acc);
- ok ->
- start_applications(Apps, [App|Acc])
+ case application:start(App) of
+ {error, {already_started, _}} ->
+ start_applications(Apps, Acc);
+ {error, {not_started, Dep}} ->
+ start_applications([Dep, App | Apps], Acc);
+ {error, {not_running, Dep}} ->
+ start_applications([Dep, App | Apps], Acc);
+ ok ->
+ start_applications(Apps, [App|Acc])
end.
stop_applications(Apps) ->
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c448b142/test/couch_changes_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_changes_tests.erl b/test/couch_changes_tests.erl
index 315b8dc..589cccc 100644
--- a/test/couch_changes_tests.erl
+++ b/test/couch_changes_tests.erl
@@ -38,8 +38,6 @@ setup() ->
couch_db:ensure_full_commit(Db),
{ok, Db1} = couch_db:reopen(Db),
- Doc = couch_db:open_doc(Db1, <<"doc3">>),
-
{ok, Rev1} = save_doc(Db1, {[{<<"_id">>, <<"doc3">>}, {<<"_rev">>, Rev}]}),
Revs1 = Revs ++ [Rev1],
Revs2 = Revs1 ++ [R || {ok, R} <- [
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c448b142/test/couch_task_status_tests.erl
----------------------------------------------------------------------
diff --git a/test/couch_task_status_tests.erl b/test/couch_task_status_tests.erl
index 76196f1..f97a376 100644
--- a/test/couch_task_status_tests.erl
+++ b/test/couch_task_status_tests.erl
@@ -93,16 +93,16 @@ should_update_time_changes_on_task_progress({_, Pid}) ->
get_task_prop(Pid, updated_on) > get_task_prop(Pid, started_on)
end).
-should_control_update_frequency({_, Pid}) ->
- ?_assertEqual(66,
- begin
- ok = call(Pid, add, [{type, replication}, {progress, 0}]),
- call(Pid, update, [{progress, 50}]),
- call(Pid, update_frequency, 500),
- call(Pid, update, [{progress, 66}]),
- call(Pid, update, [{progress, 77}]),
- get_task_prop(Pid, progress)
- end).
+%%should_control_update_frequency({_, Pid}) ->
+%% ?_assertEqual(66,
+%% begin
+%% ok = call(Pid, add, [{type, replication}, {progress, 0}]),
+%% call(Pid, update, [{progress, 50}]),
+%% call(Pid, update_frequency, 500),
+%% call(Pid, update, [{progress, 66}]),
+%% call(Pid, update, [{progress, 77}]),
+%% get_task_prop(Pid, progress)
+%% end).
should_reset_control_update_frequency({_, Pid}) ->
?_assertEqual(87,