You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/10/13 14:00:49 UTC
[2/3] brooklyn-library git commit: Fix storm live test setup/teardown
Fix storm live test setup/teardown
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/03b414c4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/03b414c4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/03b414c4
Branch: refs/heads/master
Commit: 03b414c4b449713a33334c0a57ee98b35c2d2567
Parents: 50331ca
Author: Aled Sage <al...@gmail.com>
Authored: Tue Oct 10 09:04:20 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Oct 10 09:04:20 2017 +0100
----------------------------------------------------------------------
.../storm/StormAbstractCloudLiveTest.java | 29 +++++++-------------
1 file changed, 10 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/03b414c4/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java
index 9fa27bf..e712791 100644
--- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java
+++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java
@@ -34,8 +34,9 @@ import org.apache.brooklyn.core.entity.Attributes;
import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.core.entity.EntityAsserts;
import org.apache.brooklyn.core.entity.trait.Startable;
-import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport;
+import org.apache.brooklyn.entity.messaging.storm.topologies.ExclamationBolt;
+import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.core.ResourceUtils;
import org.apache.brooklyn.util.core.file.ArchiveBuilder;
@@ -45,10 +46,12 @@ import org.apache.brooklyn.util.time.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+
import backtype.storm.Config;
import backtype.storm.StormSubmitter;
import backtype.storm.generated.AlreadyAliveException;
@@ -57,12 +60,6 @@ import backtype.storm.generated.StormTopology;
import backtype.storm.testing.TestWordSpout;
import backtype.storm.topology.TopologyBuilder;
-import org.apache.brooklyn.entity.messaging.storm.topologies.ExclamationBolt;
-import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
-
public abstract class StormAbstractCloudLiveTest extends BrooklynAppLiveTestSupport {
protected static final Logger log = LoggerFactory
@@ -73,17 +70,11 @@ public abstract class StormAbstractCloudLiveTest extends BrooklynAppLiveTestSupp
private Storm supervisor;
private Storm ui;
- @BeforeClass(alwaysRun = true)
- public void beforeClass() throws Exception {
- mgmt = new LocalManagementContext();
- location = mgmt.getLocationRegistry()
- .getLocationManaged(getLocation(), getFlags());
+ @BeforeMethod(alwaysRun = true)
+ @Override
+ public void setUp() throws Exception {
super.setUp();
- }
-
- @AfterClass(alwaysRun = true)
- public void afterClass() throws Exception {
- // Entities.destroyAll(mgmt);
+ location = mgmt.getLocationRegistry().getLocationManaged(getLocation(), getFlags());
}
public abstract String getLocation();