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 2016/06/01 17:05:23 UTC

[1/2] brooklyn-server git commit: Mark as broken LoadBalancingPolicyConcurrencyTest.testConcurrentlyRemoveContainers

Repository: brooklyn-server
Updated Branches:
  refs/heads/master 115a3712d -> 56fcc1632


Mark as broken LoadBalancingPolicyConcurrencyTest.testConcurrentlyRemoveContainers

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3fa6a5fe
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3fa6a5fe
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3fa6a5fe

Branch: refs/heads/master
Commit: 3fa6a5fe28e9168acdd269cf8f2a91bcd218ae07
Parents: 115a371
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jun 1 17:58:30 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jun 1 18:03:30 2016 +0100

----------------------------------------------------------------------
 .../LoadBalancingPolicyConcurrencyTest.java     | 23 +++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3fa6a5fe/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.java
index fe21d13..2a27f74 100644
--- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.java
+++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.java
@@ -64,7 +64,23 @@ public class LoadBalancingPolicyConcurrencyTest extends AbstractLoadBalancingPol
         super.after();
     }
     
-    @Test
+    /**
+     * TODO BROOKLYN-272, Disabled, because fails non-deterministically in jenkins (brooklyn-master-build #223):
+     * 
+     * testSimplePeriodicWorkrateUpdates(org.apache.brooklyn.policy.loadbalancing.LoadBalancingPolicyConcurrencyTest)  Time elapsed: 11.237 sec  <<< FAILURE!
+     * org.apache.brooklyn.util.exceptions.PropagatedRuntimeException: failed succeeds-eventually, 29 attempts, 10002ms elapsed: AssertionError: actual=[20.0, 20.0, 21.0, 20.0, 0.0, 21.0, 21.0, 20.0, 20.0, 20.0, 19.0, 19.0, 19.0, 36.0, 21.0, 21.0, 20.0, 19.0, 20.0, 21.0]; expected=[20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0, 20.0] expected [20.0] but found [0.0]
+     *     at org.testng.Assert.fail(Assert.java:94)
+     *     at org.testng.Assert.failNotEquals(Assert.java:494)
+     *     at org.testng.Assert.assertEquals(Assert.java:207)
+     *     at org.apache.brooklyn.policy.loadbalancing.AbstractLoadBalancingPolicyTest.assertWorkrates(AbstractLoadBalancingPolicyTest.java:122)
+     *     at org.apache.brooklyn.policy.loadbalancing.AbstractLoadBalancingPolicyTest$2.run(AbstractLoadBalancingPolicyTest.java:138)
+     *     at org.apache.brooklyn.test.Asserts$RunnableAdapter.call(Asserts.java:1277)
+     *     at org.apache.brooklyn.test.Asserts.succeedsEventually(Asserts.java:930)
+     *     at org.apache.brooklyn.test.Asserts.succeedsEventually(Asserts.java:854)
+     *     at org.apache.brooklyn.policy.loadbalancing.AbstractLoadBalancingPolicyTest.assertWorkratesEventually(AbstractLoadBalancingPolicyTest.java:136)
+     *     at org.apache.brooklyn.policy.loadbalancing.LoadBalancingPolicyConcurrencyTest.testSimplePeriodicWorkrateUpdates(LoadBalancingPolicyConcurrencyTest.java:79)
+     */
+    @Test(groups="Broken")
     public void testSimplePeriodicWorkrateUpdates() {
         List<MockItemEntity> items = Lists.newArrayList();
         List<MockContainerEntity> containers = Lists.newArrayList();
@@ -144,8 +160,9 @@ public class LoadBalancingPolicyConcurrencyTest extends AbstractLoadBalancingPol
         assertWorkratesEventually(containers, items, Collections.nCopies(NUM_CONTAINERS, 20d), WORKRATE_JITTER);
     }
     
-    // TODO Got IndexOutOfBoundsException from containers.last()
-    @Test(groups="WIP", invocationCount=100)
+    // TODO Got IndexOutOfBoundsException from containers.last().
+    // Changed test group from "WIP" to "Broken".
+    @Test(groups="Broken")
     public void testConcurrentlyRemoveContainers() {
         List<MockItemEntity> items = Lists.newArrayList();
         final List<MockContainerEntity> containers = Lists.newArrayList();


[2/2] brooklyn-server git commit: This closes #172

Posted by al...@apache.org.
This closes #172


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/56fcc163
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/56fcc163
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/56fcc163

Branch: refs/heads/master
Commit: 56fcc1632ea4f5ac7f4136a7e04fabf501337540
Parents: 115a371 3fa6a5f
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jun 1 18:05:12 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jun 1 18:05:12 2016 +0100

----------------------------------------------------------------------
 .../LoadBalancingPolicyConcurrencyTest.java     | 23 +++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------