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

Merge pull request #877 from basho/feature/fix/RTS-354

Browse Source 
adjust tests for fix
This commit is contained in:
Gordon Guthrie 2015-10-02 13:07:45 +00:00
commit 6d9e1d8fb7
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/timeseries_util.erl
View File

@ -147,22 +147,23 @@ get_valid_select_data() ->
Family = <<"family1">>,
Series = <<"seriesX">>,
Times = lists:seq(1, 10),
[[Family, Series, X, get_varchar(), get_float()] || X <- Times].
[[Family, Series, X, get_varchar(), get_float()] || X <- Times].
-define(SPANNING_STEP, (1000*1000*60*5)).
-define(SPANNING_STEP, (1000*60*5)).
get_valid_qry_spanning_quanta() ->
EndTime = ?SPANNING_STEP * 10,
StartTime = 1 + ?SPANNING_STEP * 1,
EndTime = 1 + ?SPANNING_STEP * 10,
lists:flatten(
io_lib:format("select * from GeoCheckin Where time > 1 and time < ~b"
io_lib:format("select * from GeoCheckin Where time > ~b and time < ~b"
" and myfamily = 'family1' and myseries = 'seriesX'",
[EndTime])).
[StartTime, EndTime])).
get_valid_select_data_spanning_quanta() ->
Family = <<"family1">>,
Series = <<"seriesX">>,
Times = lists:seq(1, ?SPANNING_STEP * 10, ?SPANNING_STEP), %% five-minute intervals, to span 15-min buckets
Times = lists:seq(1 + ?SPANNING_STEP, 1 + ?SPANNING_STEP * 10, ?SPANNING_STEP), %% five-minute intervals, to span 15-min buckets
[[Family, Series, X, get_varchar(), get_float()] || X <- Times].

3
tests/ts_A_select_pass_1.erl
View File

@ -21,6 +21,5 @@ confirm() ->
Qry = get_valid_qry(),
Expected = {
timeseries_util:get_cols(docs),
timeseries_util:exclusive_result_from_data(Data, 1, 9)},
timeseries_util:exclusive_result_from_data(Data, 2, 9)},
confirm_select(Cluster, TestType, DDL, Data, Qry, Expected).

2
tests/ts_A_select_pass_2.erl
View File

@ -32,5 +32,5 @@ confirm() ->
Qry = timeseries_util:get_valid_qry_spanning_quanta(),
Expected = {
timeseries_util:get_cols(docs),
timeseries_util:exclusive_result_from_data(Data, 1, 9)},
timeseries_util:exclusive_result_from_data(Data, 2, 9)},
timeseries_util:confirm_select(single, normal, DDL, Data, Qry, Expected).

2
tests/ts_B_select_pass_1.erl
View File

@ -21,5 +21,5 @@ confirm() ->
Qry = get_valid_qry(),
Expected = {
timeseries_util:get_cols(docs),
timeseries_util:exclusive_result_from_data(Data, 1, 9)},
timeseries_util:exclusive_result_from_data(Data, 2, 9)},
confirm_select(Cluster, TestType, DDL, Data, Qry, Expected).