Extend sibling test to test HTTP API (#22)

There is no test of the fetch of an individual vtag via the HTTP API - the riak erlang http client does not support it.

It is a documented part of the API however, and it fails in Riak 3.4.0 when using the metadata_version v1.

Author: martinsumner

tests/verify_siblingmerge_basic.erl

@@ -26,12 +26,13 @@
 -include_lib("stdlib/include/assert.hrl").
 
 -define(DEFAULT_RING_SIZE, 8).
--define(CFG(),
+-define(CFG(MetadataVersion),
         [{riak_kv,
           [
            % Speedy AAE configuration
            {anti_entropy, {off, []}},
-           {tictacaae_active, passive}
+           {tictacaae_active, passive},
+           {metadata_version, MetadataVersion}
           ]},
          {riak_core,
           [
@@ -44,9 +45,13 @@
 -define(N_VAL, 3).
 
 confirm() ->
-    C0 = rt:build_cluster(?NUM_NODES, ?CFG()),
+    C0 = rt:build_cluster(?NUM_NODES, ?CFG(v0)),
     ok = rt:wait_until_nodes_agree_about_ownership(C0),
     ok = verify_siblingmerge(C0),
+    rt:clean_cluster(C0),
+    C1 = rt:build_cluster(?NUM_NODES, ?CFG(v1)),
+    ok = rt:wait_until_nodes_agree_about_ownership(C1),
+    ok = verify_siblingmerge(C1),
     pass.
 
 
@@ -66,6 +71,36 @@ verify_siblingmerge(Cluster) ->
     ExpectedValsBoth = [<<1:8/integer>>, <<2:8/integer>>],
     test_replicas(Node1A, ?AMT_BUCKET, to_key(1), ExpectedValsBoth),
 
+    ?LOG_INFO("Test the HTTP API represents siblings as expected"),
+
+    application:ensure_started(inets),
+
+    {ok, _HTTPPid} = inets:start(httpc, [{profile, test_client}]),
+    URLBase = rt:http_url(Node1A),
+    KeyURL =
+        io_lib:format(
+            "~s/buckets/~s/keys/~s",
+            [URLBase, ?AMT_BUCKET, to_key(1)]
+        ),
+    {ok, Result} = httpc:request(KeyURL),
+
+    ?assertMatch(300, element(2, element(1, Result))),
+    ["Siblings:", VT1, VT2] = string:tokens(element(3, Result), "\n"),
+    ?LOG_INFO("Vtags of siblings ~s ~s", [VT1, VT2]),
+
+    ?LOG_INFO("Test that individual siblings can be fetched"),
+
+    {ok, R1} = httpc:request(io_lib:format("~s?vtag=~s", [KeyURL, VT1])),
+    {ok, R2} = httpc:request(io_lib:format("~s?vtag=~s", [KeyURL, VT2])),
+
+    ?assertMatch(200, element(2, element(1, R1))),
+    ?assertMatch(200, element(2, element(1, R2))),
+    
+    BothResults = element(3,R1) ++ element(3, R2),
+    ?assertMatch([1, 2], lists:sort(BothResults)),
+
+    inets:stop(httpc, test_client),
+
     ?LOG_INFO("Testing allow_mult = false"),
     {Node1B, Node2B} =
         select_two_different_primarynodes(Cluster, ?AMF_BUCKET, to_key(1)),