From 5ebb4e013edf18e74a0ce23c4eb1bc3e7ea4353e Mon Sep 17 00:00:00 2001 From: Philip Abbet <philip.abbet@idiap.ch> Date: Fri, 20 Jan 2017 09:59:09 +0100 Subject: [PATCH] During tests, use the new image priority mechanism --- beat/core/dock.py | 4 ++-- beat/core/test/test_docker.py | 2 +- beat/core/test/test_execution.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/beat/core/dock.py b/beat/core/dock.py index 333de89d..c5151887 100755 --- a/beat/core/dock.py +++ b/beat/core/dock.py @@ -64,11 +64,11 @@ class Host(object): self.environments = {} - def setup(self): + def setup(self, raise_on_errors=True): self.client = docker.Client(**self.kwargs) - self.environments = self._discover_environments(raise_on_errors=False) + self.environments = self._discover_environments(raise_on_errors) def __contains__(self, key): diff --git a/beat/core/test/test_docker.py b/beat/core/test/test_docker.py index 7ac27577..96237c12 100755 --- a/beat/core/test/test_docker.py +++ b/beat/core/test/test_docker.py @@ -56,7 +56,7 @@ class AsyncTest(unittest.TestCase): @classmethod def setUpClass(cls): cls.host = Host() - cls.host.setup() + cls.host.setup(raise_on_errors=False) @classmethod diff --git a/beat/core/test/test_execution.py b/beat/core/test/test_execution.py index 3503fbbf..7f384fa4 100644 --- a/beat/core/test/test_execution.py +++ b/beat/core/test/test_execution.py @@ -60,7 +60,7 @@ class TestExecution(unittest.TestCase): @classmethod def setUpClass(cls): cls.host = Host() - cls.host.setup() + cls.host.setup(raise_on_errors=False) @classmethod -- GitLab