Skip to content

Commit

Permalink
[TEST] fix bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
javanna committed Sep 2, 2016
1 parent 51620f7 commit 52581d2
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void testOsStats() {
assertThat(stats.getTimestamp(), greaterThan(0L));
assertThat(stats.getCpu().getPercent(), anyOf(equalTo((short) -1),
is(both(greaterThanOrEqualTo((short) 0)).and(lessThanOrEqualTo((short) 100)))));
double[] loadAverage = stats.getCpu().loadAverage;
double[] loadAverage = stats.getCpu().getLoadAverage();
if (loadAverage != null) {
assertThat(loadAverage.length, equalTo(3));
}
Expand Down

0 comments on commit 52581d2

Please sign in to comment.