From b41fa549a0a690008097c74c66077b68f167d8d0 Mon Sep 17 00:00:00 2001 From: "Engel A. Sanchez" Date: Thu, 15 Nov 2012 15:48:51 -0500 Subject: [PATCH 1/2] Removing tests for legacy listkeys --- tests/verify_listkeys.erl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/verify_listkeys.erl b/tests/verify_listkeys.erl index ef3f9d34..986cad72 100644 --- a/tests/verify_listkeys.erl +++ b/tests/verify_listkeys.erl @@ -90,10 +90,9 @@ put_keys(Node, Bucket, Num) -> [riakc_pb_socket:put(Pid, riakc_obj:new(Bucket, Key, Val)) || {Key, Val} <- lists:zip(Keys, Vals)], riakc_pb_socket:stop(Pid). -list_keys(Node, Bucket, Attempt, Legacy, Num, ShouldPass) -> +list_keys(Node, Bucket, Attempt, Num, ShouldPass) -> Pid = rt:pbc(Node), - lager:info("Listing keys on ~p. Legacy: ~p, Attempt #~p", [Node, Legacy, Attempt]), - rpc:call(Node, application, set_env, [riak_kv, legacy_keylisting, Legacy]), + lager:info("Listing keys on ~p. Attempt #~p", [Node, Attempt]), case ShouldPass of true -> @@ -148,5 +147,5 @@ check_it_all(Nodes, ShouldPass) -> [check_a_node(N, ShouldPass) || N <- Nodes]. check_a_node(Node, ShouldPass) -> - [list_keys(Node, ?BUCKET, Attempt, Legacy, ?NUM_KEYS, ShouldPass) || Attempt <- [1,2,3], Legacy <- [true, false]], - [list_buckets(Node, Attempt, Legacy, ?NUM_BUCKETS, ShouldPass) || Attempt <- [1,2,3], Legacy <- [true, false]]. \ No newline at end of file + [list_keys(Node, ?BUCKET, Attempt, ?NUM_KEYS, ShouldPass) || Attempt <- [1,2,3] ], + [list_buckets(Node, Attempt, Legacy, ?NUM_BUCKETS, ShouldPass) || Attempt <- [1,2,3], Legacy <- [true, false]]. From e524fd8299aadf0c367370de5da35dd0632b26ff Mon Sep 17 00:00:00 2001 From: "Engel A. Sanchez" Date: Fri, 16 Nov 2012 11:43:55 -0500 Subject: [PATCH 2/2] Also remove legacy list buckets test --- tests/verify_listkeys.erl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/verify_listkeys.erl b/tests/verify_listkeys.erl index 986cad72..7ea2c8a0 100644 --- a/tests/verify_listkeys.erl +++ b/tests/verify_listkeys.erl @@ -114,10 +114,9 @@ put_buckets(Node, Num) -> [riakc_pb_socket:put(Pid, riakc_obj:new(Bucket, Key, Val)) || Bucket <- Buckets], riakc_pb_socket:stop(Pid). -list_buckets(Node, Attempt, Legacy, Num, ShouldPass) -> +list_buckets(Node, Attempt, Num, ShouldPass) -> Pid = rt:pbc(Node), - lager:info("Listing buckets on ~p. Legacy: ~p, Attempt #~p", [Node, Legacy, Attempt]), - rpc:call(Node, application, set_env, [riak_kv, legacy_keylisting, Legacy]), + lager:info("Listing buckets on ~p. Attempt #~p", [Node, Attempt]), {Status, Buckets} = riakc_pb_socket:list_buckets(Pid), ?assertEqual(ok, Status), @@ -148,4 +147,4 @@ check_it_all(Nodes, ShouldPass) -> check_a_node(Node, ShouldPass) -> [list_keys(Node, ?BUCKET, Attempt, ?NUM_KEYS, ShouldPass) || Attempt <- [1,2,3] ], - [list_buckets(Node, Attempt, Legacy, ?NUM_BUCKETS, ShouldPass) || Attempt <- [1,2,3], Legacy <- [true, false]]. + [list_buckets(Node, Attempt, ?NUM_BUCKETS, ShouldPass) || Attempt <- [1,2,3] ].