From c132d2b70dd3e53ca84b197c1ab51eee8bfc46b5 Mon Sep 17 00:00:00 2001 From: shin- Date: Wed, 11 Sep 2013 21:20:42 +0200 Subject: [PATCH] Fixed tests --- tests/test.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/test.py b/tests/test.py index 24f4a6f7..0ddee06c 100644 --- a/tests/test.py +++ b/tests/test.py @@ -38,10 +38,16 @@ class BaseTestCase(unittest.TestCase): def tearDown(self): if len(self.tmp_imgs) > 0: - self.client.remove_image(*self.tmp_imgs) + try: + self.client.remove_image(*self.tmp_imgs) + except docker.APIError: + pass if len(self.tmp_containers) > 0: - self.client.stop(*self.tmp_containers, t=1) - self.client.remove_container(*self.tmp_containers) + try: + self.client.stop(*self.tmp_containers, t=1) + self.client.remove_container(*self.tmp_containers) + except docker.APIError: + pass ######################### ## INFORMATION TESTS ## @@ -278,8 +284,11 @@ class TestRemoveContainer(BaseTestCase): class TestPull(BaseTestCase): def runTest(self): - self.client.remove_image('joffrey/test001') - self.client.remove_image('376968a23351') + try: + self.client.remove_image('joffrey/test001') + self.client.remove_image('376968a23351') + except docker.APIError: + pass info = self.client.info() self.assertIn('Images', info) img_count = info['Images']