Skip to content

Commit b68ffbc

Browse files
update some yokozuna tests from work done in riak/2.0 branch for 2.0.6 release
1 parent 57346dd commit b68ffbc

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

tests/yz_default_bucket_type_upgrade.erl

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@
1717
%% under the License.
1818
%%
1919
%%--------------------------------------------------------------------
20+
21+
%% @doc Test that checks to make sure that default bucket_types
22+
%% do not lose data when expiring/clearing AAE trees when
23+
%% trees are rebuilt for comparison.
24+
%% @end
25+
26+
2027
-module(yz_default_bucket_type_upgrade).
2128
-compile(export_all).
2229
-include_lib("eunit/include/eunit.hrl").
@@ -43,8 +50,9 @@
4350
]).
4451

4552
confirm() ->
46-
TestMetaData = riak_test_runner:metadata(),
47-
OldVsn = proplists:get_value(upgrade_version, TestMetaData, previous),
53+
%% This test explicitly requires an upgrade from 2.0.5 to test a
54+
%% new capability
55+
OldVsn = "2.0.5",
4856

4957
[_, Node|_] = Cluster = rt:build_cluster(lists:duplicate(4, {OldVsn, ?CFG})),
5058
rt:wait_for_cluster_service(Cluster, yokozuna),

tests/yz_extractors.erl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
%%
1919
%%-------------------------------------------------------------------
2020

21+
%% @doc Test that checks if we're caching the extractor map and that
22+
%% creating custom extractors is doable via protobufs.
23+
%% @end
24+
2125
-module(yz_extractors).
2226
-compile(export_all).
2327
-include_lib("eunit/include/eunit.hrl").
@@ -54,8 +58,9 @@
5458
]).
5559

5660
confirm() ->
57-
TestMetaData = riak_test_runner:metadata(),
58-
OldVsn = proplists:get_value(upgrade_version, TestMetaData, previous),
61+
%% This test explicitly requires an upgrade from 2.0.5 to test a
62+
%% new capability
63+
OldVsn = "2.0.5",
5964

6065
[_, Node|_] = Cluster = rt:build_cluster(lists:duplicate(4, {OldVsn, ?CFG})),
6166
rt:wait_for_cluster_service(Cluster, yokozuna),

0 commit comments

Comments
 (0)