You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/09/28 14:04:49 UTC
[1/2] brooklyn-library git commit: Fix tests tearDown (to always stop
management context)
Repository: brooklyn-library
Updated Branches:
refs/heads/master 127c96916 -> 779269de2
Fix tests tearDown (to always stop management context)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/36055305
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/36055305
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/36055305
Branch: refs/heads/master
Commit: 360553053c9feecbd9911495d775865033d0c4b1
Parents: 127c969
Author: Aled Sage <al...@gmail.com>
Authored: Thu Sep 21 09:16:32 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Sep 21 09:16:32 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/cm/salt/HighstateTest.java | 4 ++--
.../org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/36055305/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
----------------------------------------------------------------------
diff --git a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
index e5d130a..586a569 100644
--- a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
+++ b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
@@ -48,7 +48,7 @@ public class HighstateTest {
@AfterMethod(alwaysRun=true)
public void tearDown() {
- if ( app != null) {
+ if (app != null) {
Entities.destroyAll(app.getManagementContext());
app = null;
}
@@ -57,7 +57,7 @@ public class HighstateTest {
@Test
public void shouldSetSensorsOnEntity() throws Exception {
String contents = getTestYaml();
- TestApplication app = TestApplication.Factory.newManagedInstanceForTests();
+ app = TestApplication.Factory.newManagedInstanceForTests();
entity = app.createAndManageChild(EntitySpec.create(SaltEntity.class)
.configure(SaltEntity.START_STATES, ImmutableSet.of("apache")));
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/36055305/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java
----------------------------------------------------------------------
diff --git a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java
index 89b63f3..4c29d5f 100644
--- a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java
+++ b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java
@@ -37,14 +37,14 @@ public class SaltConfigsTest {
@AfterMethod(alwaysRun=true)
public void tearDown() {
if ( app != null) {
- Entities.destroyAll(app.getManagementContext());
+ Entities.destroyAll(app.getManagementContext());
app = null;
}
}
@Test
public void testAddToRunList() {
- TestApplication app = TestApplication.Factory.newManagedInstanceForTests();
+ app = TestApplication.Factory.newManagedInstanceForTests();
SaltConfigs.addToRunList(app, "a", "b");
Set<? extends String> runs = app.getConfig(SaltConfig.START_STATES);
Assert.assertEquals(runs, ImmutableSet.of("a", "b"));
@@ -52,7 +52,7 @@ public class SaltConfigsTest {
@Test
public void testAddLaunchAttributes() {
- TestApplication app = TestApplication.Factory.newManagedInstanceForTests();
+ app = TestApplication.Factory.newManagedInstanceForTests();
SaltConfigs.addLaunchAttributes(app, ImmutableMap.of("k1", "v1"));
Map<String, Object> attribs = app.getConfig(SaltConfig.SALT_SSH_LAUNCH_ATTRIBUTES);
Assert.assertEquals(attribs, ImmutableMap.of("k1", "v1"));
@@ -60,7 +60,7 @@ public class SaltConfigsTest {
@Test
public void testAddToFormulas() {
- TestApplication app = TestApplication.Factory.newManagedInstanceForTests();
+ app = TestApplication.Factory.newManagedInstanceForTests();
SaltConfigs.addToFormulas(app, "v1");
SaltConfigs.addToFormulas(app, "v2");
final Set<? extends String> formulas = app.getConfig(SaltConfig.SALT_FORMULAS);
[2/2] brooklyn-library git commit: This closes #131
Posted by dr...@apache.org.
This closes #131
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/779269de
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/779269de
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/779269de
Branch: refs/heads/master
Commit: 779269de264d54b95572385a2b119dffe8d8da78
Parents: 127c969 3605530
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Thu Sep 28 15:04:42 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Thu Sep 28 15:04:42 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/cm/salt/HighstateTest.java | 4 ++--
.../org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------