From 6321f2553358afe1bb40f9705bc8bbda4520c831 Mon Sep 17 00:00:00 2001 From: nvbn Date: Wed, 2 Sep 2015 13:52:06 +0300 Subject: [PATCH] Fix bare run of func tests --- tests/functional/utils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 9a45a89c..7042c088 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -44,9 +44,10 @@ def spawn(request, tag, dockerfile, cmd, install=True, copy_src=False): def _finalizer(): proc.terminate() - container_id = subprocess.check_output(['docker', 'ps']) \ - .decode('utf-8').split('\n')[-2].split()[0] - subprocess.check_call(['docker', 'kill', container_id]) + if not bare: + container_id = subprocess.check_output(['docker', 'ps']) \ + .decode('utf-8').split('\n')[-2].split()[0] + subprocess.check_call(['docker', 'kill', container_id]) request.addfinalizer(_finalizer) return proc