Skip to content

Re-add the G-Sets riak_test code#1302

Merged
martinsumner merged 2 commits into
develop-2.2.5from
feature/gsets-readd
Oct 21, 2019
Merged

Re-add the G-Sets riak_test code#1302
martinsumner merged 2 commits into
develop-2.2.5from
feature/gsets-readd

Conversation

@russelldb

@russelldb russelldb commented Mar 1, 2018

Copy link
Copy Markdown
Contributor

Removed from riak_test develop-2.2 branch as the feature was not on the riak_kv develop-2.2 branch, however, the PR basho/riak_kv#1665 will add it for the 2.2.5 release.

I don't think this needs review as it was already in the branch, this is just a pair of git reverts

This was referenced Mar 1, 2018
Merged
Merged
Closed
@ghost

ghost commented Mar 20, 2018 •
edited by ghost
Loading

Copy link
Copy Markdown

This passed when rebased onto 2.2.5 but only with the following modifications .

fix_riak_test.patch.txt

diff --git a/src/riak_test_lager_backend.erl b/src/riak_test_lager_backend.erl
index b1644bef..dd42c637 100644
--- a/src/riak_test_lager_backend.erl
+++ b/src/riak_test_lager_backend.erl
@@ -183,11 +183,11 @@ log_test_() ->
                         lager:info("Here's a message"),
                         lager:debug("Here's another message"),
                         {ok, Logs} = gen_event:delete_handler(lager_event, riak_test_lager_backend, []),
-                        ?assertEqual(3, length(Logs)),
-                        
-                        ?assertMatch([_, "[debug]", "Lager installed handler riak_test_lager_backend into lager_event"], re:split(lists:nth(1, Logs), " ", [{return, list}, {parts, 3}])),
-                        ?assertMatch([_, "[info]", "Here's a message"], re:split(lists:nth(2, Logs), " ", [{return, list}, {parts, 3}])),
-                        ?assertMatch([_, "[debug]", "Here's another message"], re:split(lists:nth(3, Logs), " ", [{return, list}, {parts, 3}]))
+                        ?assertEqual(2, length(Logs))
+                        %%,
+                        % ?assertMatch([_, "[debug]", "Lager installed handler riak_test_lager_backend into lager_event"], re:split(lists:nth(1, Logs), " ", [{return, list}, {parts, 3}])),
+                        % ?assertMatch([_, "[info]", "Here's a message"], re:split(lists:nth(2, Logs), " ", [{return, list}, {parts, 3}])),
+                        % ?assertMatch([_, "[debug]", "Here's another message"], re:split(lists:nth(3, Logs), " ", [{return, list}, {parts, 3}]))
                         
                 end
             }
diff --git a/src/rt.erl b/src/rt.erl
index 3df13a31..33de0d0f 100644
--- a/src/rt.erl
+++ b/src/rt.erl
@@ -2249,11 +2249,13 @@ verify_product(Applications, ExpectedApplication) ->
 product_test_() ->
     {foreach,
      fun() -> ok end,
-     [verify_product([riak_cs], riak_cs),
-      verify_product([riak_repl, riak_kv, riak_cs], riak_cs),
-      verify_product([riak_repl], riak_ee),
-      verify_product([riak_repl, riak_kv], riak_ee),
-      verify_product([riak_kv], riak),
-      verify_product([kernel], unknown)]}.
+     [
+    %%  verify_product([riak_cs], riak_cs),
+    %%  verify_product([riak_repl, riak_kv, riak_cs], riak_cs),
+    %%  verify_product([riak_repl], riak_ee),
+    %%  verify_product([riak_repl, riak_kv], riak_ee),
+    %%  verify_product([riak_kv], riak),
+    %%  verify_product([kernel], unknown)
+     ]}.
 
 -endif.

@ghost ghost mentioned this pull request Mar 20, 2018
Merged
@russelldb

russelldb commented Mar 21, 2018

Copy link
Copy Markdown
Contributor Author

Hi @bryanhuntesl, I don't understand. The test in this PR fails without those modifications?

@ghost

ghost commented Mar 21, 2018

Copy link
Copy Markdown

Yep that's right, fresh checkout on my machine, rebase or merge.

@russelldb

russelldb commented Mar 21, 2018

Copy link
Copy Markdown
Contributor Author

Thanks, I'll look into it.

@ghost

ghost commented Mar 21, 2018

Copy link
Copy Markdown

Could really do with some CI servers.

@russelldb

russelldb commented Mar 21, 2018

Copy link
Copy Markdown
Contributor Author

CI servers are on the way. But basho never had CI for riak_test, only eunit etc.

ghost
ghost approved these changes Mar 26, 2018
View reviewed changes

@ghost ghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This P/R looks good with either of our p/r ( #1303 / #1304 ) merged before. +1 after merging one of the prerequisite p/r

@martinsumner

martinsumner commented Oct 21, 2019

Copy link
Copy Markdown

Already added to develop-2.9 and develop-3.0. OK to merge into 2.2.5 for completeness

@martinsumner
martinsumner merged commit cc136cb into develop-2.2.5 Oct 21, 2019
@martinsumner
martinsumner deleted the feature/gsets-readd branch October 21, 2019 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@russelldb @martinsumner