From db53ad1ddf4f3b87582fbd2a8516b77d9c031723 Mon Sep 17 00:00:00 2001 From: Allen Gao Date: Mon, 1 Feb 2016 20:08:57 +0800 Subject: Move the install base type check to kolla-build The install type is converted in kolla-build, so it will never fail in dockerfile, move the check to kolla-build just above the install type converting. TrivialFix Co-Authored-By: Jeffrey Zhang Change-Id: I1500d3b47e909f94ea9f68c5245297733f63a70b --- kolla/tests/test_build.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'kolla/tests') diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index d1ace9ec8..634fa3abb 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -11,6 +11,7 @@ # limitations under the License. import fixtures +import itertools import mock import os @@ -102,3 +103,28 @@ class WorkerThreadTest(base.TestCase): path=FAKE_IMAGE['path'], tag=FAKE_IMAGE['fullname'], nocache=False, rm=True, pull=True, forcerm=True, buildargs=build_args) + + +class KollaWorkerTest(base.TestCase): + + def test_supported_base_type(self): + rh_base = ['fedora', 'centos', 'oraclelinux', 'rhel'] + rh_type = ['source', 'binary', 'rdo', 'rhos'] + deb_base = ['ubuntu', 'debian'] + deb_type = ['source', 'binary'] + + for base_distro, install_type in itertools.chain( + itertools.product(rh_base, rh_type), + itertools.product(deb_base, deb_type)): + self.conf.set_override('base', base_distro) + self.conf.set_override('install_type', install_type) + # should no exception raised + build.KollaWorker(self.conf) + + def test_unsupported_base_type(self): + for base_distro, install_type in itertools.product( + ['ubuntu', 'debian'], ['rdo', 'rhos']): + self.conf.set_override('base', base_distro) + self.conf.set_override('install_type', install_type) + self.assertRaises(build.KollaMismatchBaseTypeException, + build.KollaWorker, self.conf) -- cgit v1.2.3