Skip to content

Commit

Permalink
Fix two lines of wrong rtcs:pass() usage in access_stats_test
Browse files Browse the repository at this point in the history 
The bug was introduced at commit a07eb28.
This commit is a partial revert ot it.

True fix
  • Loading branch information
@shino
shino committed Jul 17, 2015
1 parent 3c8c1b4 commit 8c133ae
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions riak_test/tests/access_stats_test.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
rtcs:pass().
pass.

verify_stats_lost_logging(UserConfig, RiakNodes, CSNodes) ->
KeyId = UserConfig#aws_config.access_key_id,
Expand All @@ -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),
rtcs:pass().
pass.


node_samples_from_content(json, Node, Content) ->
Expand Down

6 comments on commit 8c133ae

@kuenishi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from kuenishi
at 8c133ae

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging basho/riak_cs/bugfix/wrong-rtcs-pass = 8c133ae into borshop-integration-1195-bugfix/wrong-rtcs-pass

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basho/riak_cs/bugfix/wrong-rtcs-pass = 8c133ae merged ok, testing candidate = 09ec885

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.bos1/builders/test-riak_cs/builds/1374

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding develop to borshop-integration-1195-bugfix/wrong-rtcs-pass = 09ec885

Please sign in to comment.