From ae34973d350433ea22d7f0467100193832e6de0f Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Mon, 1 Aug 2016 13:35:25 +0800 Subject: Fix the kolla_docker issue with docker 1.12 After docker 1.12, the RepoTags will be None rather than [] in the image list API. This PS will handle the both case. Change-Id: Ie2da44b44229c2f190550755b50876f607f9cc0c Closes-Bug: #1608358 --- tests/test_kolla_docker.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'tests') diff --git a/tests/test_kolla_docker.py b/tests/test_kolla_docker.py index a05d91edb..f62bb603a 100644 --- a/tests/test_kolla_docker.py +++ b/tests/test_kolla_docker.py @@ -388,6 +388,28 @@ class TestImage(base.BaseTestCase): self.dw.dc.images.assert_called_once_with() self.assertEqual(self.fake_data['images'][0], return_data) + def test_check_image_before_docker_1_12(self): + self.dw = get_DockerWorker( + {'image': 'myregistrydomain.com:5000/centos:7.0'}) + self.fake_data['images'][0]['RepoTags'] = [] + self.dw.dc.images.return_value = self.fake_data['images'] + + return_data = self.dw.check_image() + self.assertFalse(self.dw.changed) + self.dw.dc.images.assert_called_once_with() + self.assertEqual(self.fake_data['images'][1], return_data) + + def test_check_image_docker_1_12(self): + self.dw = get_DockerWorker( + {'image': 'myregistrydomain.com:5000/centos:7.0'}) + self.fake_data['images'][0]['RepoTags'] = None + self.dw.dc.images.return_value = self.fake_data['images'] + + return_data = self.dw.check_image() + self.assertFalse(self.dw.changed) + self.dw.dc.images.assert_called_once_with() + self.assertEqual(self.fake_data['images'][1], return_data) + def test_compare_image(self): self.dw = get_DockerWorker( {'image': 'myregistrydomain.com:5000/ubuntu:16.04'}) -- cgit v1.2.3