valitydev/riak_test
14
0
Fork 0
mirror of https://github.com/valitydev/riak_test.git synced 2024-11-06 16:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add better support for EQC tests

Browse Source
This commit is contained in:
Brett Hazen 2015-11-19 20:54:16 -07:00
parent d4c29b22c0
commit 3b0398c636
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/ts_B_random_query_pass_eqc.erl
View File

@ -49,8 +49,11 @@ run_query(ClusterConn, NVal, NPuts, Q, NSpans) ->
Query = make_query(Bucket, Q, NSpans),
TestType = normal,
{_, Got} = ts_util:ts_query(ClusterConn, TestType, DDL, Data, Query, Bucket),
{_Cluster, Conn} = ClusterConn,
{ok, _} = ts_util:create_and_activate_bucket_type(ClusterConn, DDL, Bucket, NVal),
ok = riakc_ts:put(Conn, Bucket, Data),
{_, Got} = ts_util:single_query(Conn, Query),
%% should get the data back
Got2 = [tuple_to_list(X) || X <- Got],

14
tests/ts_util.erl
View File

@ -26,6 +26,7 @@
cluster_and_connect/1,
create_and_activate_bucket_type/2,
create_and_activate_bucket_type/3,
create_and_activate_bucket_type/4,
create_bucket_type/2,
create_bucket_type/3,
exclusive_result_from_data/3,
@ -129,16 +130,19 @@ create_bucket_type(Cluster, DDL) ->
create_bucket_type({Cluster, _Conn}, DDL, Bucket) ->
create_bucket_type(Cluster, DDL, Bucket);
create_bucket_type(Cluster, DDL, Bucket) ->
[Node|_Rest] = Cluster,
NVal = length(Cluster),
create_bucket_type(Cluster, DDL, Bucket, NVal).
-spec(create_bucket_type(node()|{[node()],term()}, string(), string(), non_neg_integer()) -> {ok, term()} | term()).
create_bucket_type([Node|_Rest], DDL, Bucket, NVal) when is_integer(NVal) ->
Props = io_lib:format("{\\\"props\\\": {\\\"n_val\\\": ~s, \\\"table_def\\\": \\\"~s\\\"}}", [integer_to_list(NVal), DDL]),
rt:admin(Node, ["bucket-type", "create", bucket_to_list(Bucket), lists:flatten(Props)]).
-spec(activate_bucket_type(node(), string()) -> {ok, string()} | term()).
-spec(activate_bucket_type([node()], string()) -> {ok, string()} | term()).
activate_bucket_type([Node|_Rest], Bucket) ->
rt:admin(Node, ["bucket-type", "activate", bucket_to_list(Bucket)]).
-spec(create_and_activate_bucket_type({[node()],term()}, string()) -> term()).
-spec(create_and_activate_bucket_type([node()]|{[node()],term()}, string()) -> term()).
create_and_activate_bucket_type({Cluster, _Conn}, DDL) ->
create_and_activate_bucket_type(Cluster, DDL);
create_and_activate_bucket_type(Cluster, DDL) ->
@ -150,6 +154,10 @@ create_and_activate_bucket_type({Cluster, _Conn}, DDL, Bucket) ->
create_and_activate_bucket_type(Cluster, DDL, Bucket)->
{ok, _} = create_bucket_type(Cluster, DDL, Bucket),
activate_bucket_type(Cluster, Bucket).
-spec(create_and_activate_bucket_type({[node()],term()}, string(), string(), non_neg_integer()) -> term()).
create_and_activate_bucket_type({Cluster, _Conn}, DDL, Bucket, NVal) ->
{ok, _} = create_bucket_type(Cluster, DDL, Bucket, NVal),
activate_bucket_type(Cluster, Bucket).
bucket_to_list(Bucket) when is_binary(Bucket) ->
binary_to_list(Bucket);