You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/03/24 01:29:03 UTC
[1/2] incubator-brooklyn git commit: Fix
UsageResourceTest.testListApplicationUsages
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 75503d9e4 -> 3465b52ea
Fix UsageResourceTest.testListApplicationUsages
- Was failing occasionally if the requested start/end date rounded down
to a different value than the postStart date.
- I suspect 1 in 1000 chance, because depended if afterPostStart was in
a different second from postStart - it was adding 1ms to it.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dce73a2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dce73a2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dce73a2e
Branch: refs/heads/master
Commit: dce73a2e60210d911269437ef7839c3d66d7691e
Parents: 5fa1444
Author: Aled Sage <al...@gmail.com>
Authored: Wed Mar 18 13:38:59 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Mar 23 23:36:01 2015 +0000
----------------------------------------------------------------------
.../rest/resources/UsageResourceTest.java | 27 ++++++++++++++------
1 file changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dce73a2e/usage/rest-server/src/test/java/brooklyn/rest/resources/UsageResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/UsageResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/UsageResourceTest.java
index 1cadbcd..ad67c51 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/resources/UsageResourceTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/UsageResourceTest.java
@@ -91,7 +91,12 @@ public class UsageResourceTest extends BrooklynRestResourceTest {
Date preStart = new Date();
String appId = createApp(simpleSpec);
Date postStart = new Date();
-
+
+ // We will retrieve usage from one millisecond after start; this guarantees to not be
+ // told about both STARTING+RUNNING, which could otherwise happen if they are in the
+ // same milliscond.
+ Date afterPostStart = new Date(postStart.getTime()+1);
+
// Check that app's usage is returned
ClientResponse response = client().resource("/v1/usage/applications").get(ClientResponse.class);
assertEquals(response.getStatus(), Response.Status.OK.getStatusCode());
@@ -105,17 +110,23 @@ public class UsageResourceTest extends BrooklynRestResourceTest {
usages = response.getEntity(new GenericType<List<UsageStatistics>>() {});
assertTrue(Iterables.isEmpty(usages), "usages="+usages);
- long afterPostStart = postStart.getTime()+1;
- waitForFuture(afterPostStart);
-
- // check app start and end date truncated, even if running for longer
- // note that start==end means we get a snapshot of the apps in use at that exact time.
- response = client().resource("/v1/usage/applications?start="+afterPostStart+"&end="+afterPostStart).get(ClientResponse.class);
+ // Wait, so that definitely asking about things that have happened (not things in the future,
+ // or events that are happening this exact same millisecond)
+ waitForFuture(afterPostStart.getTime());
+
+ // Check app start + end date truncated, even if running for longer (i.e. only tell us about this time window).
+ // Note that start==end means we get a snapshot of the apps in use at that exact time.
+ //
+ // The start/end times in UsageStatistic are in String format, and are rounded down to the nearest second.
+ // The comparison does use the milliseconds passed in the REST call though.
+ // The rounding down result should be the same as roundDown(afterPostStart), because that is the time-window
+ // we asked for.
+ response = client().resource("/v1/usage/applications?start="+afterPostStart.getTime()+"&end="+afterPostStart.getTime()).get(ClientResponse.class);
assertEquals(response.getStatus(), Response.Status.OK.getStatusCode());
usages = response.getEntity(new GenericType<List<UsageStatistics>>() {});
usage = Iterables.getOnlyElement(usages);
assertAppUsage(usage, appId, ImmutableList.of(Status.RUNNING), roundDown(preStart), postStart);
- assertAppUsageTimesTruncated(usage, roundDown(postStart), roundDown(postStart));
+ assertAppUsageTimesTruncated(usage, roundDown(afterPostStart), roundDown(afterPostStart));
// Delete the app
Date preDelete = new Date();
[2/2] incubator-brooklyn git commit: This closes #558
Posted by al...@apache.org.
This closes #558
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3465b52e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3465b52e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3465b52e
Branch: refs/heads/master
Commit: 3465b52ea3a22b1826bb6a41c21e0db9961f8ed9
Parents: 75503d9 dce73a2
Author: Aled Sage <al...@gmail.com>
Authored: Tue Mar 24 00:28:50 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Mar 24 00:28:50 2015 +0000
----------------------------------------------------------------------
.../rest/resources/UsageResourceTest.java | 27 ++++++++++++++------
1 file changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------