From 1915054e2a6e53d1cbc421342f4e0c8fa02a960f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Mu=C3=9Fler?= Date: Tue, 8 Sep 2020 23:02:43 +0200 Subject: [PATCH] Small changes. Also use entrypoint vs cmd. --- e2e/Dockerfile | 2 +- e2e/run.sh | 2 +- e2e/tests/test_e2e.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/Dockerfile b/e2e/Dockerfile index 23421695c..868cbbd8d 100644 --- a/e2e/Dockerfile +++ b/e2e/Dockerfile @@ -19,4 +19,4 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -CMD ["python3", "-m", "unittest", "discover", "--start-directory", ".", "-v"] +ENTRYPOINT ["python3", "-m", "unittest", "discover", "--start-directory", ".", "-v"] diff --git a/e2e/run.sh b/e2e/run.sh index 0e06c2cd8..1b5e3332a 100755 --- a/e2e/run.sh +++ b/e2e/run.sh @@ -55,7 +55,7 @@ function run_tests(){ # tests modify files in ./manifests, so we mount a copy of this directory done by the e2e Makefile - docker run --rm --network=host \ + docker run -it --rm --network=host \ --mount type=bind,source="$(readlink -f ${kubeconfig_path})",target=/root/.kube/config \ --mount type=bind,source="$(readlink -f manifests)",target=/manifests \ --mount type=bind,source="$(readlink -f tests)",target=/tests \ diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index bd469e8ff..a22a97333 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -10,7 +10,6 @@ import yaml from datetime import datetime from kubernetes import client, config - def to_selector(labels): return ",".join(["=".join(l) for l in labels.items()]) @@ -34,6 +33,7 @@ class EndToEndTestCase(unittest.TestCase): In the case of test failure the cluster will stay to enable manual examination; next invocation of "make test" will re-create it. ''' + print("Test Setup being executed") # set a single K8s wrapper for all tests k8s = cls.k8s = K8s()