Tweaks to aaefold tests

some changes to make rebuilding cluster work OK, plus typos.

groups/repl_all

@@ -3,7 +3,6 @@ repl_aae_fullsync
 repl_aae_fullsync_bench
 repl_aae_fullsync_bt
 repl_aae_fullsync_custom_n
-repl_bucket_types
 repl_cancel_fullsync
 repl_consistent_object_filter
 repl_handoff_deadlock_aae
@@ -11,19 +10,19 @@ repl_handoff_deadlock_keylist
 repl_location_failures
 repl_fs_bench
 repl_fs_stat_caching
+replication2
+replication2_console_tests
+replication2_fsschedule
+replication2_connections
+replication2_dirty
+replication2_rt_sink_connection
+replication2_ssl
+replication
+replication_ssl
+replication_stats
 repl_rt_cascading_rtq
 repl_rt_heartbeat
 repl_rt_overload
 repl_rt_pending
-replication
-replication_ssl
-replication_stats
-replication2
-replication2_console_tests
-replication2_fsschedule
-replication2_ssl
-replication2_connections
-replication2_dirty
-replication2_rt_sink_connection
 verify_counter_repl
 verify_dvv_repl

groups/repl_some

@@ -1,2 +1,3 @@
+repl_bucket_types
 replication_upgrade
 replication2_upgrade

tests/verify_aaefold_nval.erl

@@ -76,6 +76,8 @@
 confirm() ->
     Nodes0 = rt:build_cluster(?NUM_NODES, ?CFG_NOREBUILD),
     ok = verify_aae_fold(Nodes0),
+    rt:clean_cluster(Nodes0),
+
     Nodes1 = rt:build_cluster(?NUM_NODES, ?CFG_REBUILD),
     lager:info("Sleeping for rebuild tick - testing with rebuilds ongoing"),
     timer:sleep(?REBUILD_TICK),
@@ -92,6 +94,7 @@ verify_aae_fold(Nodes) ->
     {ok, RH0} = riak_client:aae_fold({merge_root_nval, ?N_VAL}, CH),
     {ok, RT0} = riak_client:aae_fold({merge_root_nval, ?N_VAL}, CT),
 
+    lager:info("Commencing object load"),
     KeyLoadFun = 
         fun(Node, KeyCount) ->
             KVs = test_data(KeyCount + 1,
@@ -166,7 +169,10 @@ verify_aae_fold(Nodes) ->
     ?assertMatch(true, BH3 == BH4),
     {ok, KCL2} =
         riak_client:aae_fold({fetch_clocks_nval, ?N_VAL, DirtySegments1}, CH),
-    ?assertMatch(true, lists:sort(KCL1) == lists:sort(KCL2)).
+    ?assertMatch(true, lists:sort(KCL1) == lists:sort(KCL2)),
+    
+    % Need to re-start or clean will fail
+    rt:start_and_wait(hd(tl(Nodes))).
 
 
 to_key(N) ->

tests/verify_aaefold_range.erl

@@ -67,10 +67,11 @@ verify_aae_fold(Nodes) ->
     {ok, CT} = riak:client_connect(lists:last(Nodes)),
 
     lager:info("Fold for empty tree range"),
-    TreeQuery = {?BUCKET, all, small, all, all, pre_hash},
+    TreeQuery = {merge_tree_range, ?BUCKET, all, small, all, all, pre_hash},
     {ok, RH0} = riak_client:aae_fold(TreeQuery, CH),
     {ok, RT0} = riak_client:aae_fold(TreeQuery, CT),
 
+    lager:info("Commencing object load"),
     KeyLoadFun = 
         fun(Node, KeyCount) ->
             KVs = test_data(KeyCount + 1,