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/01/20 17:09:33 UTC
[2/3] incubator-brooklyn git commit: Fix EmptySoftwareProcessYamlTest
Fix EmptySoftwareProcessYamlTest
See https://github.com/brooklyncentral/brooklyn/issues/1377
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7191c7bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7191c7bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7191c7bc
Branch: refs/heads/master
Commit: 7191c7bc6643f4b8b71418165008934dd73a67ad
Parents: 2f3e465
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jan 19 14:55:28 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jan 20 10:28:51 2016 +0000
----------------------------------------------------------------------
.../brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7191c7bc/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java
index bb3eeb9..06badd6 100644
--- a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java
+++ b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java
@@ -25,12 +25,12 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess;
+import org.apache.brooklyn.location.ssh.SshMachineLocation;
+import org.apache.brooklyn.util.collections.Jsonya;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
-import org.apache.brooklyn.location.ssh.SshMachineLocation;
-import org.apache.brooklyn.util.collections.Jsonya;
@Test
public class EmptySoftwareProcessYamlTest extends AbstractYamlTest {
@@ -97,6 +97,6 @@ public class EmptySoftwareProcessYamlTest extends AbstractYamlTest {
Location actualMachine = entityLocationIterator.next();
Assert.assertTrue(actualMachine instanceof SshMachineLocation, "wrong location: "+actualMachine);
// TODO this, below, probably should be 'localhost on entity', see #1377
- Assert.assertEquals(actualMachine.getParent().getDisplayName(), "loopback on app");
+ Assert.assertEquals(actualMachine.getParent().getDisplayName(), "localhost on entity");
}
}