From 869e799b4187271269fa0e023c94308c0f057924 Mon Sep 17 00:00:00 2001 From: Martin Sumner Date: Fri, 15 Sep 2017 10:33:16 +0100 Subject: [PATCH] Fix tests Obviously got totally messed up and confused when testing previous commits. Multiple tests were failing for a change which got merged in as the tests were not reflecting the required API. --- test/end_to_end/basic_SUITE.erl | 4 ++-- test/end_to_end/recovery_SUITE.erl | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/end_to_end/basic_SUITE.erl b/test/end_to_end/basic_SUITE.erl index ce8f4b0..e59a7b1 100644 --- a/test/end_to_end/basic_SUITE.erl +++ b/test/end_to_end/basic_SUITE.erl @@ -534,8 +534,8 @@ space_clear_ondelete(_Config) -> io:format("Waiting for journal deletes - blocked~n"), timer:sleep(20000), - % for this query snapshot is made at fold time - true = length(HTreeF1()) == 0, + % for this query snapshot is made at fold time - EDIT now uses a snapshot! + true = length(HTreeF1()) == 80000, % This query uses a genuine async fold on a snasphot made at request time true = length(KF1()) == 80000, diff --git a/test/end_to_end/recovery_SUITE.erl b/test/end_to_end/recovery_SUITE.erl index aeffa7d..de32e5a 100644 --- a/test/end_to_end/recovery_SUITE.erl +++ b/test/end_to_end/recovery_SUITE.erl @@ -116,7 +116,9 @@ aae_missingjournal(_Config) -> leveled_bookie:book_returnfolder(Bookie1, {foldheads_allkeys, ?RIAK_TAG, - FoldHeadsFun}), + FoldHeadsFun, + true, + true}), HeadL1 = length(AllHeadF1()), io:format("Fold head returned ~w objects~n", [HeadL1]), @@ -132,7 +134,9 @@ aae_missingjournal(_Config) -> leveled_bookie:book_returnfolder(Bookie2, {foldheads_allkeys, ?RIAK_TAG, - FoldHeadsFun}), + FoldHeadsFun, + true, + true}), HeadL2 = length(AllHeadF2()), io:format("Fold head returned ~w objects~n", [HeadL2]), true = HeadL2 < HeadL1,