You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/12/16 06:48:31 UTC
brooklyn-server git commit: Mark test as integration
Repository: brooklyn-server
Updated Branches:
refs/heads/0.10.0 ad34129fd -> 41561635e
Mark test as integration
The test requires an ssh server to be listening on port 22.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/41561635
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/41561635
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/41561635
Branch: refs/heads/0.10.0
Commit: 41561635e3bbb0524dbeaae516a26c793174fd93
Parents: ad34129
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Dec 5 15:11:31 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Dec 15 15:32:28 2016 +0200
----------------------------------------------------------------------
.../location/ssh/SshMachineLocationIntegrationTest.java | 4 +---
.../apache/brooklyn/location/ssh/SshMachineLocationTest.java | 5 -----
2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/41561635/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java
index d0214fd..0e8a3d3 100644
--- a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java
@@ -96,11 +96,9 @@ public class SshMachineLocationIntegrationTest extends SshMachineLocationTest {
super.testSshExecCommands();
}
- // Overridden just to make it integration (because `newHost()` returns a real ssh'ing host)
@Test(groups="Integration")
- @Override
public void testIsSshableWhenTrue() throws Exception {
- super.testIsSshableWhenTrue();
+ assertTrue(host.isSshable());
}
// Overridden just to make it integration (because `newHost()` returns a real ssh'ing host)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/41561635/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java
index 3b6239c..447e1eb 100644
--- a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java
@@ -240,11 +240,6 @@ public class SshMachineLocationTest extends BrooklynAppUnitTestSupport {
}
@Test
- public void testIsSshableWhenTrue() throws Exception {
- assertTrue(host.isSshable());
- }
-
- @Test
public void obtainSpecificPortGivesOutPortOnlyOnce() {
int port = 2345;
assertTrue(host.obtainSpecificPort(port));