aboutsummaryrefslogtreecommitdiff
path: root/kolla/tests
diff options
context:
space:
mode:
authorMark Goddard <mgoddard@cray.com>2016-05-31 12:01:06 -0500
committerMark Goddard <mgoddard@cray.com>2016-05-31 12:19:17 -0500
commitb3e8ac8371a497aed6270358062cdfe4952a37ae (patch)
treea4718f11304d679ba858e8c882f131b659a08ab0 /kolla/tests
parent4ad1af1328b9e558b2e596d518a99b7a4c8efee9 (diff)
downloadkolla-b3e8ac8371a497aed6270358062cdfe4952a37ae.tar.gz
kolla-b3e8ac8371a497aed6270358062cdfe4952a37ae.zip
Don't always unpack image build results tuple, as it may be None
Change-Id: I21b1327da1de1bd3cc3018ba37715b0a19c1dbef Closes-Bug: #1587501
Diffstat (limited to 'kolla/tests')
-rw-r--r--kolla/tests/test_build.py27
1 files changed, 27 insertions, 0 deletions
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index b6eeffa7d..cc55bd48a 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -218,3 +218,30 @@ class KollaWorkerTest(base.TestCase):
kolla.images = self.images
self.assertRaises(ValueError,
kolla.filter_images)
+
+
+@mock.patch.object(build, 'run_build')
+class MainTest(base.TestCase):
+
+ def test_images_built(self, mock_run_build):
+ image_statuses = ({}, {'img': 'built'}, {})
+ mock_run_build.return_value = image_statuses
+ result = build.main()
+ self.assertEqual(0, result)
+
+ def test_images_unmatched(self, mock_run_build):
+ image_statuses = ({}, {}, {'img': 'unmatched'})
+ mock_run_build.return_value = image_statuses
+ result = build.main()
+ self.assertEqual(0, result)
+
+ def test_no_images_built(self, mock_run_build):
+ mock_run_build.return_value = None
+ result = build.main()
+ self.assertEqual(0, result)
+
+ def test_bad_images(self, mock_run_build):
+ image_statuses = ({'img': 'error'}, {}, {})
+ mock_run_build.return_value = image_statuses
+ result = build.main()
+ self.assertEqual(1, result)