From 2d4cf52f33085800a11f15d6bf2482fce8829524 Mon Sep 17 00:00:00 2001 From: Svetoslav Neykov Date: Mon, 5 Dec 2016 15:11:31 +0200 Subject: [PATCH] Mark test as integration The test requires an ssh server to be listening on port 22. --- .../location/ssh/SshMachineLocationIntegrationTest.java | 4 +--- .../apache/brooklyn/location/ssh/SshMachineLocationTest.java | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) 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 d0214fd9fb..0e8a3d313a 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 void testSshExecCommands() throws Exception { 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) 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 3b6239cc6c..447e1ebe76 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 @@ -239,11 +239,6 @@ public void testSshExecCommands() throws Exception { assertTrue(outString.contains(expectedName), outString); } - @Test - public void testIsSshableWhenTrue() throws Exception { - assertTrue(host.isSshable()); - } - @Test public void obtainSpecificPortGivesOutPortOnlyOnce() { int port = 2345;