From 280eedc839c5128cd66d276a1c58f098d0c99553 Mon Sep 17 00:00:00 2001 From: Christopher Meiklejohn Date: Thu, 12 Dec 2013 12:13:44 -0500 Subject: [PATCH 1/4] Fix compilation errors in EQC tests. --- test/rt_sink_eqc.erl | 16 ++++++++-------- test/rt_source_eqc.erl | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/rt_sink_eqc.erl b/test/rt_sink_eqc.erl index 38763f7c..967551b1 100644 --- a/test/rt_sink_eqc.erl +++ b/test/rt_sink_eqc.erl @@ -108,7 +108,7 @@ precondition(S, {call, _, push_object, _Args}) -> S#state.sources /= []; precondition(S, {call, _, Connect, [Remote]}) when Connect == connect_from_v1; Connect == connect_from_v2 -> lists:member(Remote, S#state.remotes_available); -precondition(S, {call, _, Connect, [#src_state{done_fun_queue = []}, _]}) -> +precondition(_S, {call, _, _Connect, [#src_state{done_fun_queue = []}, _]}) -> false; precondition(_S, _Call) -> true. @@ -256,7 +256,7 @@ postcondition(_S, {call, _, push_object, [{_Remote, #src_state{version = 1} = Sr _QWhat -> false end; -postcondition(S, {call, _, push_object, [{Remote, #src_state{version = 2} = SrcState}, RiakObj, AlreadyRouted]}, Res) -> +postcondition(_S, {call, _, push_object, [{Remote, #src_state{version = 2} = _SrcState}, _RiakObj, _AlreadyRouted]}, Res) -> RTQRes = Res#push_result.rtq_res, HelperRes = Res#push_result.donefun, Routed = lists:member(Remote, Res#push_result.already_routed), @@ -304,7 +304,7 @@ postcondition(_S, {call, _, call_donefun, [{Remote, SrcState}, NthDoneFun]}, Res case riak_repl2_rtframe:decode(TCPBin) of {ok, {ack, _SomeSeq}, <<>>} -> true; - FrameDecode -> + _FrameDecode -> false end; {1, {{error, timeout}, {error, timeout}}} -> @@ -483,7 +483,7 @@ start_service_manager() -> abstract_fake_source() -> riak_repl_test_util:reset_meck(fake_source, [no_link, non_strict]), - meck:expect(fake_source, connected, fun(Socket, Transport, Endpoint, Proto, Pid, Props) -> + meck:expect(fake_source, connected, fun(Socket, Transport, Endpoint, Proto, Pid, _Props) -> Transport:controlling_process(Socket, Pid), gen_server:call(Pid, {connected, Socket, Endpoint, Proto}) end). @@ -508,7 +508,7 @@ fake_rtq(Bug, Queue) -> Bug ! Got, Queue2 = [{NumItems, Bin, Meta} | Queue], fake_rtq(Bug, Queue2); - Else -> + _Else -> ok end. @@ -537,7 +537,7 @@ connect_source(Version, Remote) -> {active, false}], ClientSpec = {{realtime, [Version]}, {TcpOptions, fake_source, Pid}}, IpPort = {{127,0,0,1}, ?SINK_PORT}, - ConnRes = riak_core_connection:sync_connect(IpPort, ClientSpec), + riak_core_connection:sync_connect(IpPort, ClientSpec), {ok, Pid}. fake_source_push_obj(Source, Binary, AlreadyRouted) -> @@ -565,7 +565,7 @@ fake_source_loop(#fake_source{socket = undefined} = State) -> {'$gen_call', From, Aroo} -> gen_server:reply(From, {error, badcall}), exit({badcall, Aroo}); - What -> + _ -> fake_source_loop(State) end; fake_source_loop(State) -> @@ -618,7 +618,7 @@ fake_source_loop(State) -> fake_source_loop(State#fake_source{tcp_bug = NewBug}); {tcp_closed, Socket} when Socket == State#fake_source.socket -> ok; - What -> + _ -> fake_source_loop(State) end. diff --git a/test/rt_source_eqc.erl b/test/rt_source_eqc.erl index 601ffd26..6cc3b84f 100644 --- a/test/rt_source_eqc.erl +++ b/test/rt_source_eqc.erl @@ -132,11 +132,11 @@ initial_state() -> {ok, _FakeSinkPid} = start_fake_sink(), #state{}. -next_state(S, Res, {call, _, connect_to_v1, [Remote, MQ]}) -> +next_state(S, Res, {call, _, connect_to_v1, [Remote, _MQ]}) -> SrcState = #src_state{pids = Res, version = 1}, next_state_connect(Remote, SrcState, S); -next_state(S, Res, {call, _, connect_to_v2, [Remote, MQ]}) -> +next_state(S, Res, {call, _, connect_to_v2, [Remote, _MQ]}) -> SrcState = #src_state{pids = Res, version = 2}, next_state_connect(Remote, SrcState, S); @@ -205,11 +205,11 @@ generate_unacked_from_master(State, Remote) -> generate_unacked_from_master([], _UpRemotes, _Remote, Skips, Offset, Acc) -> {Acc, Skips, Offset}; -generate_unacked_from_master([{Seq, tombstone} | Tail], UpRemotes, Remote, undefined, Offset, Acc) -> +generate_unacked_from_master([{_Seq, tombstone} | Tail], UpRemotes, Remote, undefined, Offset, Acc) -> generate_unacked_from_master(Tail, UpRemotes, Remote, undefined, Offset, Acc); -generate_unacked_from_master([{Seq, tombstone} | Tail], UpRemotes, Remote, Skips, Offset, Acc) -> +generate_unacked_from_master([{_Seq, tombstone} | Tail], UpRemotes, Remote, Skips, Offset, Acc) -> generate_unacked_from_master(Tail, UpRemotes, Remote, Skips + 1, Offset, Acc); -generate_unacked_from_master([{Seq, Remotes, Binary, Res} | Tail], UpRemotes, Remote, Skips, Offset, Acc) -> +generate_unacked_from_master([{Seq, Remotes, _Binary, Res} | Tail], UpRemotes, Remote, Skips, Offset, Acc) -> case {lists:member(Remote, Remotes), Skips} of {true, undefined} -> % on start up, we don't worry about skips until we've sent at least @@ -474,9 +474,9 @@ connect_to_v1(RemoteName, MasterQueue) -> connect_to_v2(RemoteName, MasterQueue) -> stateful:set(version, {realtime, {2,0}, {2,0}}), stateful:set(remote, RemoteName), - Before = now(), + now(), {ok, SourcePid} = riak_repl2_rtsource_conn:start_link(RemoteName), - After = now(), + now(), receive {sink_started, SinkPid} -> erlang:monitor(process, SinkPid), @@ -648,7 +648,7 @@ fake_sink(Socket, Version, Bug, History) -> fake_sink(Socket, Version, Bug, History); {'$gen_call', From, {block_until, HistoryLength}} -> fake_sink(Socket, Version, {block_until, From, HistoryLength}, History); - {'$gen_call', From, Msg} -> + {'$gen_call', From, _Msg} -> gen_server:reply(From, {error, badcall}), fake_sink(Socket, Version, Bug, History); {tcp, Socket, Bin} -> From 4097a607dde59d99e236618803126d3a148a1868 Mon Sep 17 00:00:00 2001 From: Dave Parfitt Date: Thu, 12 Dec 2013 12:22:23 -0500 Subject: [PATCH 2/4] fixed connection include --- test/riak_core_cluster_mgr_tests.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/riak_core_cluster_mgr_tests.erl b/test/riak_core_cluster_mgr_tests.erl index 50dd7adf..84ad9546 100644 --- a/test/riak_core_cluster_mgr_tests.erl +++ b/test/riak_core_cluster_mgr_tests.erl @@ -5,7 +5,7 @@ -compile(export_all). -include("riak_core_cluster.hrl"). --include_lib("riak_core/include/riak_core_connection.hrl"). +-include("riak_core_connection.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(TRACE(Stmt),Stmt). From 8b7fbdfdbc1771d290c2a6936cc90786ad4063ba Mon Sep 17 00:00:00 2001 From: Christopher Meiklejohn Date: Thu, 12 Dec 2013 12:34:30 -0500 Subject: [PATCH 3/4] Repair header reference. --- test/riak_core_cluster_mgr_sup_tests.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/riak_core_cluster_mgr_sup_tests.erl b/test/riak_core_cluster_mgr_sup_tests.erl index acf8fe1e..e86e371c 100644 --- a/test/riak_core_cluster_mgr_sup_tests.erl +++ b/test/riak_core_cluster_mgr_sup_tests.erl @@ -1,7 +1,7 @@ -module(riak_core_cluster_mgr_sup_tests). -compile(export_all). -ifdef(EQC). --include_lib("riak_core/include/riak_core_connection.hrl"). +-include("riak_core_connection.hrl"). -include_lib("eunit/include/eunit.hrl"). murdering_test_() -> From 1186411ccf07f6be8c597e362ea46da46d40bc7f Mon Sep 17 00:00:00 2001 From: Christopher Meiklejohn Date: Thu, 12 Dec 2013 12:38:42 -0500 Subject: [PATCH 4/4] Update ignores. --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 8fea8411..cdf0df40 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,8 @@ ebin/*.beam ebin/*.app deps .eunit +.eqc-info +.qc/ +current_counterexample.eqc +erl_crash.dump +repl_leader_eqc_data/