brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [1/2] brooklyn-server git commit: Mark test as integration
Date Tue, 06 Dec 2016 09:26:58 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 79416825d -> 9f8a3aae0


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/2d4cf52f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2d4cf52f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2d4cf52f

Branch: refs/heads/master
Commit: 2d4cf52f33085800a11f15d6bf2482fce8829524
Parents: 7941682
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Mon Dec 5 15:11:31 2016 +0200
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Mon Dec 5 15:11:31 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/2d4cf52f/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/2d4cf52f/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));


Mime
View raw message