Use rtcs:pass() after test success

basho · Jul 17, 2015 · a07eb28 · a07eb28 · kuenishi · Jul 17, 2015
1 parent 9a2b090
commit a07eb28
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/riak_test/tests/access_stats_test.erl b/riak_test/tests/access_stats_test.erl
@@ -100,7 +100,7 @@ assert_access_stats(Format, UserConfig, {Begin, End}) ->
     ?assertEqual(  1, sum_samples(Format, "BucketRead",   "Count", Samples)),
     ?assertEqual(  1, sum_samples(Format, "KeyDelete",    "Count", Samples)),
     ?assertEqual(  1, sum_samples(Format, "BucketDelete", "Count", Samples)),
-    pass.
+    rtcs:pass().
 
 verify_stats_lost_logging(UserConfig, RiakNodes, CSNodes) ->
     KeyId = UserConfig#aws_config.access_key_id,
@@ -115,7 +115,7 @@ verify_stats_lost_logging(UserConfig, RiakNodes, CSNodes) ->
     ExpectLine = io_lib:format("lost access stat: User=~s, Slice=", [KeyId]),
     lager:debug("expected log line: ~s", [ExpectLine]),
     true = rt:expect_in_log(CSNode, ExpectLine),
-    pass.
+    rtcs:pass().
 
 
 node_samples_from_content(json, Node, Content) ->

diff --git a/riak_test/tests/auth_bypass_test.erl b/riak_test/tests/auth_bypass_test.erl
@@ -36,7 +36,7 @@ confirm() ->
     confirm_auth_bypass("riak-cs", "usage/" ++ KeyId ++ "/ab/" ++
                             rtcs:datetime() ++ "/" ++ rtcs:datetime(),
                         UserConfig, Port),
-    pass.
+    rtcs:pass().
 
 confirm_auth_bypass_for_stats(Bucket, Key, UserConfig, Port) ->
     {S3Content, CurlContent} = get_both_contents(Bucket, Key, UserConfig, Port),

diff --git a/riak_test/tests/block_audit_test.erl b/riak_test/tests/block_audit_test.erl
@@ -40,7 +40,7 @@ confirm() ->
         {multibag, _} ->
             lager:info("Block audit script does not supprt multibag env."),
             lager:info("Skip the test."),
-            pass;
+            rtcs:pass();
         _ -> confirm1()
     end.
 
@@ -74,7 +74,7 @@ confirm1() ->
     BlockKeysFileList = [filename:join([Home, "actual-orphaned-blocks", B]) ||
                         B <- [?BUCKET1, ?BUCKET2]],
     tools_helper:offline_delete({RiakNodes, CSNodes, Stanchion}, BlockKeysFileList),
-    pass.
+    rtcs:pass().
 
 setup_objects(RiakNodes, UserConfig, Bucket, Type,
               KeyAlive, KeyOrphaned, KeyFalseOrphaned) ->

diff --git a/riak_test/tests/buckets_test.erl b/riak_test/tests/buckets_test.erl
@@ -61,7 +61,7 @@ confirm() ->
 
     ok = verify_max_buckets_per_user(UserConfig),
 
-    pass.
+    rtcs:pass().
 
 
 verify_create_delete(UserConfig) ->

diff --git a/riak_test/tests/gc_tests.erl b/riak_test/tests/gc_tests.erl
@@ -83,7 +83,7 @@ confirm() ->
     setup_normal_obj([{"spam", 42}, {"ham", 65536}, {"egg", 7}], UserConfig),
 
     verify_partial_gc_run(hd(CSNodes), RiakNodes, Start, End),
-    pass.
+    rtcs:pass().
 
 setup_normal_obj(ObjSpecs, UserConfig) ->
     %% Put and delete some objects

diff --git a/riak_test/tests/legacy_s3_rewrite_test.erl b/riak_test/tests/legacy_s3_rewrite_test.erl
@@ -46,7 +46,7 @@ confirm() ->
     WaitTime = 2 * rt_config:get(rt_max_wait_time),
     case rtcs:cmd(Cmd, [{cd, CsSrcDir}, {env, Env}, {args, Args}], WaitTime) of
         ok ->
-            pass;
+            rtcs:pass();
         {error, Reason} ->
             lager:error("Error : ~p", [Reason]),
             error({?MODULE, Reason})

diff --git a/riak_test/tests/list_objects_v2_test.erl b/riak_test/tests/list_objects_v2_test.erl
@@ -32,7 +32,7 @@ confirm() ->
     pass = list_objects_test_helper:test(UserConfig),
 
     ok = list_to_non_existent_bucket_many_times(RiakNodes),
-    pass.
+    rtcs:pass().
 
 assert_v2_is_default(CSNodes) ->
     true = rpc:call(hd(CSNodes), riak_cs_list_objects_utils, fold_objects_for_list_keys, []),

diff --git a/riak_test/tests/migration_15_to_20_test.erl b/riak_test/tests/migration_15_to_20_test.erl
@@ -54,19 +54,19 @@ confirm(upgrade_with_full_ops) ->
     {ok, InitialState} = cs_suites:new(SetupRes),
     {ok, EvolvedState} = cs_suites:fold_with_state(InitialState, upgrade_history()),
     {ok, _FinalState}  = cs_suites:cleanup(EvolvedState),
-    pass;
+    rtcs:pass();
 confirm(upgrade_with_reduced_ops) ->
     SetupRes = setup_previous(),
     {ok, InitialState} = cs_suites:new(SetupRes, rtcs:reduced_ops()),
     {ok, EvolvedState} = cs_suites:fold_with_state(InitialState, upgrade_history()),
     {ok, _FinalState}  = cs_suites:cleanup(EvolvedState),
-    pass;
+    rtcs:pass();
 confirm(no_upgrade_with_reduced_ops) ->
     SetupRes = rtcs:setup(2, rtcs:configs(custom_configs(current))),
     {ok, InitialState} = cs_suites:new(SetupRes, cs_suites:reduced_ops()),
     {ok, EvolvedState} = cs_suites:fold_with_state(InitialState, no_upgrade_history()),
     {ok, _FinalState}  = cs_suites:cleanup(EvolvedState),
-    pass.
+    rtcs:pass().
 
 setup_previous() ->
     PrevConfigs = rtcs:previous_configs(custom_configs(previous)),

diff --git a/riak_test/tests/migration_mixed_test.erl b/riak_test/tests/migration_mixed_test.erl
@@ -41,7 +41,7 @@ confirm() ->
     {ok, InitialState} = cs_suites:new(SetupRes),
     {ok, EvolvedState} = cs_suites:fold_with_state(InitialState, history()),
     {ok, _FinalState}  = cs_suites:cleanup(EvolvedState),
-    pass.
+    rtcs:pass().
 
 setup_previous() ->
     PrevConfigs = rtcs:previous_configs(custom_configs(previous)),

diff --git a/riak_test/tests/select_gc_bucket_test.erl b/riak_test/tests/select_gc_bucket_test.erl
@@ -39,7 +39,7 @@ confirm() ->
         {multibag, _} ->
             lager:info("select_gc_bucket script does not supprt multibag env."),
             lager:info("Skip the test."),
-            pass;
+            rtcs:pass();
         _ -> confirm1()
     end.
 
@@ -67,7 +67,7 @@ confirm1() ->
     lager:debug("select_gc_bucket.erl log:============= END"),
 
     tools_helper:offline_delete({RiakNodes, CSNodes, Stanchion}, [BlockKeysFile]),
-    pass.
+    rtcs:pass().
 
 upload_object(UserConfig, Bucket, normal, Key) ->
     SingleBlock = crypto:rand_bytes(400),

diff --git a/riak_test/tests/sibling_benchmark.erl b/riak_test/tests/sibling_benchmark.erl
@@ -114,7 +114,7 @@ confirm() ->
     ?assertEqual(ok, erlcloud_s3:delete_bucket(?TEST_BUCKET, UserConfig)),
     lager:info("User is valid on the cluster, and has no buckets"),
     ?assertEqual([{buckets, []}], erlcloud_s3:list_buckets(UserConfig)),
-    pass.
+    rtcs:pass().
 
 start_object_reader(UserConfig) ->
     Pid = spawn_link(fun() -> object_reader(UserConfig, 1) end),