diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-10-20 10:54:17 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-10-27 11:13:18 +0100 |
| commit | c4c28814e06fc0f90f7679ef9b1831cd3d89f692 (patch) | |
| tree | b470167d23194cfde5448669c5ad7981d13eddd4 | |
| parent | efaab1f3a568543a4a22d6b0789e8210d00eec4f (diff) | |
| download | kolla-c4c28814e06fc0f90f7679ef9b1831cd3d89f692.tar.gz kolla-c4c28814e06fc0f90f7679ef9b1831cd3d89f692.zip | |
build: unbreak JSON serializer on failed builds
Commit 3fa5a236b4d8a31a57e14cbb482e664d5cc0111c converted status
consts into Enum. But not completely - this fix gets it done properly.
Also fixed tests.
Change-Id: Ifdacf62cd4b99c452bd09de7c6cde6fbee75560d
| -rwxr-xr-x | kolla/image/build.py | 4 | ||||
| -rw-r--r-- | kolla/tests/test_build.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 84fc32b01..3cfbbc202 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -1168,10 +1168,10 @@ class KollaWorker(object): LOG.info("Images that failed to build") LOG.info("===========================") for name, status in sorted(self.image_statuses_bad.items()): - LOG.error('%s Failed with status: %s', name, status) + LOG.error('%s Failed with status: %s', name, status.value) results['failed'].append({ 'name': name, - 'status': status, + 'status': status.value, }) if self.conf.logs_dir and status == Status.ERROR: linkname = os.path.join(self.conf.logs_dir, diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index 2812e115e..00bdd6d32 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -646,11 +646,11 @@ class KollaWorkerTest(base.TestCase): def test_summary(self): kolla = build.KollaWorker(self.conf) kolla.images = self.images - kolla.image_statuses_good['good'] = None - kolla.image_statuses_bad['bad'] = None - kolla.image_statuses_unmatched['unmatched'] = None + kolla.image_statuses_good['good'] = build.Status.BUILT + kolla.image_statuses_bad['bad'] = build.Status.ERROR + kolla.image_statuses_unmatched['unmatched'] = build.Status.UNMATCHED results = kolla.summary() - self.assertIsNone(results['failed'][0]['status']) + self.assertEqual('error', results['failed'][0]['status']) @mock.patch('shutil.copytree') def test_work_dir(self, copytree_mock): |