Implementing Keywords ExecuteBash and ExecuteCmd

exense · Jun 22, 2020 · 451a870 · 451a870
1 parent 5a2c5ee
commit 451a870
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/...rary-kw-system/src/main/java/ch/exense/step/library/kw/system/AbstractProcessKeyword.java b/...rary-kw-system/src/main/java/ch/exense/step/library/kw/system/AbstractProcessKeyword.java
@@ -4,10 +4,12 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.util.List;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
 import ch.exense.commons.processes.ManagedProcess;
+import ch.exense.commons.processes.ManagedProcess.ManagedProcessException;
 import step.grid.io.Attachment;
 import step.grid.io.AttachmentHelper;
 import step.handlers.javahandler.AbstractKeyword;
@@ -67,10 +69,21 @@ protected void executeManagedCommand(String cmd, int timeoutMs, OutputConfigurat
 		executeManagedCommand(cmd, timeoutMs, outputConfiguration, null);
 	}
 
+	protected void executeManagedCommand(List<String> cmd, int timeoutMs, OutputConfiguration outputConfiguration, Consumer<ManagedProcess> postProcess) throws Exception {
+		ManagedProcess process = new ManagedProcess(cmd);
+		executeManagedCommand(timeoutMs, outputConfiguration, postProcess, process);
+	}
+
 	protected void executeManagedCommand(String cmd, int timeoutMs, OutputConfiguration outputConfiguration, Consumer<ManagedProcess> postProcess) throws Exception {
-		boolean hasError = false;
 		ManagedProcess process = new ManagedProcess(cmd);
+		executeManagedCommand(timeoutMs, outputConfiguration, postProcess, process);
+	}
+
+	protected void executeManagedCommand(int timeoutMs, OutputConfiguration outputConfiguration,
+			Consumer<ManagedProcess> postProcess, ManagedProcess process)
+			throws ManagedProcessException, InterruptedException, IOException {
 		try {
+			boolean hasError = false;
 			process.start();
 			try {
 				int exitCode = process.waitFor(timeoutMs);

diff --git a/...tep-library-kw-system/src/main/java/ch/exense/step/library/kw/system/ProcessKeywords.java b/...tep-library-kw-system/src/main/java/ch/exense/step/library/kw/system/ProcessKeywords.java
@@ -1,5 +1,7 @@
 package ch.exense.step.library.kw.system;
 
+import java.util.ArrayList;
+
 import step.handlers.javahandler.Keyword;
 
 public class ProcessKeywords extends AbstractProcessKeyword {
@@ -23,6 +25,37 @@ public void executeSystemCommand() throws Exception {
 		readInputs();
 		executeManagedCommand(command, timeoutInMillis, outputConfiguration);
 	}
+
+	@Keyword(name = "ExecuteBash", schema = "{\"properties\":{\"" + TIMEOUT_MS + "\":{\"type\":\"string\"},"
+			+ "\"" + MAX_OUTPUT_PAYLOAD_SIZE + "\":{\"type\":\"string\"},\""
+			+ MAX_OUTPUT_ATTACHMENT_SIZE + "\":{\"type\":\"string\"},\""
+			+ CHECK_EXIT_CODE + "\":{\"type\":\"boolean\"},"
+			+ "\"" + COMMAND + "\":{\"type\":\"string\"}},\"required\":[\"" + COMMAND + "\"]}")
+	public void executeBashCommand() throws Exception {
+		readInputs();
+
+		ArrayList<String> cmd = new ArrayList<String>();
+		cmd.add("bash");
+		cmd.add("-c");
+		cmd.add(command);
+		executeManagedCommand(cmd, timeoutInMillis, outputConfiguration, null);
+	}
+
+
+	@Keyword(name = "ExecuteCmd", schema = "{\"properties\":{\"" + TIMEOUT_MS + "\":{\"type\":\"string\"},"
+			+ "\"" + MAX_OUTPUT_PAYLOAD_SIZE + "\":{\"type\":\"string\"},\""
+			+ MAX_OUTPUT_ATTACHMENT_SIZE + "\":{\"type\":\"string\"},\""
+			+ CHECK_EXIT_CODE + "\":{\"type\":\"boolean\"},"
+			+ "\"" + COMMAND + "\":{\"type\":\"string\"}},\"required\":[\"" + COMMAND + "\"]}")
+	public void executeCmdCommand() throws Exception {
+		readInputs();
+
+		ArrayList<String> cmd = new ArrayList<String>();
+		cmd.add("cmd");
+		cmd.add("/C");
+		cmd.add(command);
+		executeManagedCommand(cmd, timeoutInMillis, outputConfiguration, null);
+	}
 
 	protected void readInputs() {
 		command = input.getString(COMMAND,"");