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 2018/02/07 23:33:51 UTC
[1/2] brooklyn-server git commit: Remove unnecessary tearDown step
with duplicate call of method
Repository: brooklyn-server
Updated Branches:
refs/heads/master f8a4a3001 -> 1f9446eac
Remove unnecessary tearDown step with duplicate call of method
tearDown in EffectorResourceTest is copied from elsewhere but calls
TestRendererHints.clearRegistry();
which is documented to be called from only one test in the suite
(it's already called from SensorResourceTest).
This change prevents a race condition resulting in intermittent
failure of SensorResourceTest
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/bcc2842d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/bcc2842d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/bcc2842d
Branch: refs/heads/master
Commit: bcc2842d0e4c42afd1fb0620763c18d3b4da86df
Parents: f8a4a30
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Wed Feb 7 15:09:16 2018 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Wed Feb 7 15:09:16 2018 +0000
----------------------------------------------------------------------
.../brooklyn/rest/resources/EffectorResourceTest.java | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/bcc2842d/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/EffectorResourceTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/EffectorResourceTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/EffectorResourceTest.java
index 3519556..b395a1f 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/EffectorResourceTest.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/EffectorResourceTest.java
@@ -27,16 +27,11 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.brooklyn.api.entity.EntitySpec;
-import org.apache.brooklyn.api.sensor.AttributeSensor;
-import org.apache.brooklyn.core.config.render.RendererHints;
import org.apache.brooklyn.core.test.entity.TestEntity;
import org.apache.brooklyn.entity.stock.BasicApplication;
-import org.apache.brooklyn.rest.api.SensorApi;
-import org.apache.brooklyn.rest.test.config.render.TestRendererHints;
import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.util.time.Duration;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -55,11 +50,6 @@ public class EffectorResourceTest extends BrooklynRestResourceTest {
BasicApplication app;
TestEntity entity;
- @AfterClass(alwaysRun = true)
- public void tearDown() throws Exception {
- TestRendererHints.clearRegistry();
- }
-
@BeforeMethod(alwaysRun = true)
public void setUpMethod() throws Exception {
app = getManagementContext().getEntityManager().createEntity(EntitySpec.create(BasicApplication.class)
[2/2] brooklyn-server git commit: This closes #946
Posted by al...@apache.org.
This closes #946
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1f9446ea
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1f9446ea
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1f9446ea
Branch: refs/heads/master
Commit: 1f9446eaca8be2531bd670224da599d4cb1e3007
Parents: f8a4a30 bcc2842
Author: Aled Sage <al...@gmail.com>
Authored: Wed Feb 7 23:33:43 2018 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Feb 7 23:33:43 2018 +0000
----------------------------------------------------------------------
.../brooklyn/rest/resources/EffectorResourceTest.java | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------