You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by da...@apache.org on 2017/06/01 16:34:19 UTC
aries-containers git commit: Unit tests for Docker Local
implementation
Repository: aries-containers
Updated Branches:
refs/heads/master 7a9fa6597 -> c6e28a22b
Unit tests for Docker Local implementation
Project: http://git-wip-us.apache.org/repos/asf/aries-containers/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-containers/commit/c6e28a22
Tree: http://git-wip-us.apache.org/repos/asf/aries-containers/tree/c6e28a22
Diff: http://git-wip-us.apache.org/repos/asf/aries-containers/diff/c6e28a22
Branch: refs/heads/master
Commit: c6e28a22b6ae5c56bcc223d674ca20f8f9503c39
Parents: 7a9fa65
Author: David Bosschaert <da...@apache.org>
Authored: Thu Jun 1 18:34:04 2017 +0200
Committer: David Bosschaert <da...@apache.org>
Committed: Thu Jun 1 18:34:04 2017 +0200
----------------------------------------------------------------------
.../local/impl/LocalDockerController.java | 4 +-
.../docker/local/impl/ProcessRunner.java | 3 +
.../local/impl/LocalDockerControllerTest.java | 74 ++++++++++++++++++++
3 files changed, 79 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-containers/blob/c6e28a22/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
----------------------------------------------------------------------
diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
index cf3ede1..4904c20 100644
--- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
+++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
@@ -28,7 +28,7 @@ class LocalDockerController {
return kill(id, "KILL");
}
- private String kill(String id, String signal) throws Exception {
+ public String kill(String id, String signal) throws Exception {
return runCommandExpectSingleID("docker", "kill", "-s", signal, id);
}
@@ -91,7 +91,7 @@ class LocalDockerController {
return res;
}
- private String runCommand(String... command) {
+ String runCommand(String... command) {
return ProcessRunner.waitFor(ProcessRunner.run(command));
}
}
http://git-wip-us.apache.org/repos/asf/aries-containers/blob/c6e28a22/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ProcessRunner.java
----------------------------------------------------------------------
diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ProcessRunner.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ProcessRunner.java
index f9284ad..18e7ac0 100644
--- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ProcessRunner.java
+++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ProcessRunner.java
@@ -76,6 +76,9 @@ public class ProcessRunner {
}
public static String waitFor(final Process process) {
+ if (process == null)
+ return null;
+
try {
process.waitFor();
String res = new String(Streams.suck(process.getInputStream())).trim();
http://git-wip-us.apache.org/repos/asf/aries-containers/blob/c6e28a22/containers-docker-local/src/test/java/org/apache/aries/containers/docker/local/impl/LocalDockerControllerTest.java
----------------------------------------------------------------------
diff --git a/containers-docker-local/src/test/java/org/apache/aries/containers/docker/local/impl/LocalDockerControllerTest.java b/containers-docker-local/src/test/java/org/apache/aries/containers/docker/local/impl/LocalDockerControllerTest.java
new file mode 100644
index 0000000..4581a35
--- /dev/null
+++ b/containers-docker-local/src/test/java/org/apache/aries/containers/docker/local/impl/LocalDockerControllerTest.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.containers.docker.local.impl;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+public class LocalDockerControllerTest {
+ @BeforeClass
+ public static void setupClass() {
+ System.setProperty(ProcessRunner.SKIP_RUN, "true");
+ }
+
+ @AfterClass
+ public static void teardownClass() {
+ System.setProperty(ProcessRunner.SKIP_RUN, "false");
+ }
+
+ @Test
+ public void testKill() throws Exception {
+ LocalDockerController ldc = new LocalDockerController() {
+ @Override
+ String runCommandExpectSingleID(String... command) throws Exception {
+ assertArrayEquals(new String [] {"docker", "kill", "-s", "KILL", "123abc"}, command);
+ return "ok";
+ }
+ };
+ assertEquals("ok", ldc.kill("123abc"));
+ }
+
+ @Test
+ public void testKillSignal() throws Exception {
+ LocalDockerController ldc = new LocalDockerController() {
+ @Override
+ String runCommandExpectSingleID(String... command) throws Exception {
+ assertArrayEquals(new String [] {"docker", "kill", "-s", "TERM", "123abc"}, command);
+ return "ok";
+ }
+ };
+ assertEquals("ok", ldc.kill("123abc", "TERM"));
+ }
+
+ @Test
+ public void testRemove() throws Exception {
+ LocalDockerController ldc = new LocalDockerController() {
+ @Override
+ String runCommandExpectSingleID(String... command) throws Exception {
+ assertArrayEquals(new String [] {"docker", "rm", "-f", "123abc"}, command);
+ return "ok";
+ }
+ };
+ assertEquals("ok", ldc.remove("123abc"));
+ }
+}