You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2018/11/08 11:28:12 UTC
[3/8] brooklyn-server git commit: [core] Disable
BashCommandsIntegrationTest test on Windows
[core] Disable BashCommandsIntegrationTest test on Windows
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2ba7ce67
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2ba7ce67
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2ba7ce67
Branch: refs/heads/master
Commit: 2ba7ce671973fdf49ad099f3c744b2f38807860c
Parents: c5a851d
Author: Paul Campbell <pc...@kemitix.net>
Authored: Tue Nov 6 10:23:50 2018 +0000
Committer: Paul Campbell <pc...@kemitix.net>
Committed: Tue Nov 6 15:15:58 2018 +0000
----------------------------------------------------------------------
.../core/ssh/BashCommandsIntegrationTest.java | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2ba7ce67/core/src/test/java/org/apache/brooklyn/util/core/ssh/BashCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/ssh/BashCommandsIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/util/core/ssh/BashCommandsIntegrationTest.java
index 3f99ee3..311bce7 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/ssh/BashCommandsIntegrationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/ssh/BashCommandsIntegrationTest.java
@@ -35,6 +35,7 @@ import java.util.List;
import org.apache.brooklyn.core.test.BrooklynMgmtUnitTestSupport;
import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
+import org.apache.brooklyn.test.DisableOnWindows;
import org.apache.brooklyn.util.core.ResourceUtils;
import org.apache.brooklyn.util.core.task.BasicExecutionContext;
import org.apache.brooklyn.util.core.task.ssh.SshTasks;
@@ -133,6 +134,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testRemoveRequireTtyFromSudoersFile() throws Exception {
String cmds = BashCommands.dontRequireTtyForSudo();
@@ -154,6 +156,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs a whoami command available on localhost")
public void testSudo() throws Exception {
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
ByteArrayOutputStream errStream = new ByteArrayOutputStream();
@@ -177,6 +180,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testDownloadFirstSuccessfulFile() throws Exception {
List<String> cmds = BashCommands.commandsToDownloadUrlsAs(
ImmutableList.of(sourceNonExistantFileUrl, sourceFileUrl1, sourceFileUrl2),
@@ -188,6 +192,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs an ssh server listening on port 22 on localhost")
public void testDownloadToStdout() throws Exception {
ProcessTaskWrapper<String> t = SshTasks.newSshExecTaskFactory(loc,
"cd "+destFile.getParentFile().getAbsolutePath(),
@@ -199,6 +204,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs an ssh server listening on port 22 on localhost")
public void testAlternativesWhereFirstSucceeds() throws Exception {
ProcessTaskWrapper<Integer> t = SshTasks.newSshExecTaskFactory(loc)
.add(BashCommands.alternatives(Arrays.asList("echo first", "exit 88")))
@@ -213,6 +219,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs an ssh server listening on port 22 on localhost")
public void testAlternatives() throws Exception {
ProcessTaskWrapper<Integer> t = SshTasks.newSshExecTaskFactory(loc)
.add(BashCommands.alternatives(Arrays.asList("asdfj_no_such_command_1", "exit 88")))
@@ -224,6 +231,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs an ssh server listening on port 22 on localhost")
public void testRequireTestHandlesFailure() throws Exception {
ProcessTaskWrapper<?> t = SshTasks.newSshExecTaskFactory(loc)
.add(BashCommands.requireTest("-f "+sourceNonExistantFile.getPath(),
@@ -236,6 +244,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs an ssh server listening on port 22 on localhost")
public void testRequireTestHandlesSuccess() throws Exception {
ProcessTaskWrapper<?> t = SshTasks.newSshExecTaskFactory(loc)
.add(BashCommands.requireTest("-f "+sourceFile1.getPath(),
@@ -247,6 +256,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs an ssh server listening on port 22 on localhost")
public void testRequireFileHandlesFailure() throws Exception {
ProcessTaskWrapper<?> t = SshTasks.newSshExecTaskFactory(loc)
.add(BashCommands.requireFile(sourceNonExistantFile.getPath())).newTask();
@@ -260,6 +270,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs an ssh server listening on port 22 on localhost")
public void testRequireFileHandlesSuccess() throws Exception {
ProcessTaskWrapper<?> t = SshTasks.newSshExecTaskFactory(loc)
.add(BashCommands.requireFile(sourceFile1.getPath())).newTask();
@@ -270,6 +281,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs an ssh server listening on port 22 on localhost")
public void testRequireFailureExitsImmediately() throws Exception {
ProcessTaskWrapper<?> t = SshTasks.newSshExecTaskFactory(loc)
.add(BashCommands.requireTest("-f "+sourceNonExistantFile.getPath(),
@@ -284,6 +296,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testPipeMultiline() throws Exception {
String output = execRequiringZeroAndReturningStdout(loc,
BashCommands.pipeTextTo("hello world\n"+"and goodbye\n", "wc")).get();
@@ -292,6 +305,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testWaitForFileContentsWhenAbortingOnFail() throws Exception {
String fileContent = "mycontents";
String cmd = BashCommands.waitForFileContents(destFile.getAbsolutePath(), fileContent, Duration.ONE_SECOND, true);
@@ -305,6 +319,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testWaitForFileContentsWhenNotAbortingOnFail() throws Exception {
String fileContent = "mycontents";
String cmd = BashCommands.waitForFileContents(destFile.getAbsolutePath(), fileContent, Duration.ONE_SECOND, false);
@@ -318,6 +333,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testWaitForFileContentsWhenContentsAppearAfterStart() throws Exception {
String fileContent = "mycontents";
@@ -335,6 +351,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testWaitForFileExistsWhenAbortingOnFail() throws Exception {
String cmd = BashCommands.waitForFileExists(destFile.getAbsolutePath(), Duration.ONE_SECOND, true);
@@ -347,6 +364,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testWaitForFileExistsWhenNotAbortingOnFail() throws Exception {
String cmd = BashCommands.waitForFileExists(destFile.getAbsolutePath(), Duration.ONE_SECOND, false);
@@ -359,6 +377,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration", dependsOnMethods="testSudo")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testWaitForPortFreeWhenAbortingOnTimeout() throws Exception {
ServerSocket serverSocket = openServerSocket();
try {
@@ -378,6 +397,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration", dependsOnMethods="testSudo")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testWaitForPortFreeWhenNotAbortingOnTimeout() throws Exception {
ServerSocket serverSocket = openServerSocket();
try {
@@ -397,6 +417,7 @@ public class BashCommandsIntegrationTest extends BrooklynMgmtUnitTestSupport {
}
@Test(groups="Integration", dependsOnMethods="testSudo")
+ @DisableOnWindows(reason = "Needs a bash shell available on localhost")
public void testWaitForPortFreeWhenFreedAfterStart() throws Exception {
ServerSocket serverSocket = openServerSocket();
try {