diff options
Diffstat (limited to 'kolla/tests')
| -rw-r--r-- | kolla/tests/test_build.py | 52 | ||||
| -rw-r--r-- | kolla/tests/test_methods.py | 11 |
2 files changed, 3 insertions, 60 deletions
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index 422dfcd73..0200fadd7 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -18,7 +18,6 @@ import sys from unittest import mock from kolla.cmd import build as build_cmd -from kolla import exception from kolla.image import build from kolla.tests import base @@ -361,14 +360,11 @@ class KollaWorkerTest(base.TestCase): self.mock_client = patcher.start() def test_supported_base_type(self): - rh_base = ['centos', 'rhel'] - rh_type = ['source', 'binary', 'rdo', 'rhos'] - deb_base = ['ubuntu', 'debian'] - deb_type = ['source', 'binary'] + build_base = ['centos', 'debian', 'ubuntu'] + build_type = ['source', 'binary'] for base_distro, install_type in itertools.chain( - itertools.product(rh_base, rh_type), - itertools.product(deb_base, deb_type)): + itertools.product(build_base, build_type)): self.conf.set_override('base', base_distro) if base_distro == 'debian' and install_type == 'binary': self.conf.set_override('base_arch', 'x86_64') @@ -376,14 +372,6 @@ class KollaWorkerTest(base.TestCase): # 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(exception.KollaMismatchBaseTypeException, - build.KollaWorker, self.conf) - def test_build_image_list_adds_plugins(self): self.conf.set_override('install_type', 'source') @@ -534,20 +522,6 @@ class KollaWorkerTest(base.TestCase): kolla = build.KollaWorker(self.conf) self.assertEqual('3.9', kolla.distro_python_version) - def test_build_distro_python_version_rhel80(self): - """check distro_python_version for RHEL8.0""" - self.conf.set_override('base', 'rhel') - self.conf.set_override('base_tag', '8.0') - kolla = build.KollaWorker(self.conf) - self.assertEqual('3.6', kolla.distro_python_version) - - def test_build_distro_python_version_rhel8(self): - """check distro_python_version for RHEL8""" - self.conf.set_override('base', 'rhel') - self.conf.set_override('base_tag', '8') - kolla = build.KollaWorker(self.conf) - self.assertEqual('3.6', kolla.distro_python_version) - def test_build_distro_python_version_ubuntu(self): """check distro_python_version for Ubuntu""" self.conf.set_override('base', 'ubuntu') @@ -567,20 +541,6 @@ class KollaWorkerTest(base.TestCase): kolla = build.KollaWorker(self.conf) self.assertEqual('foo', kolla.distro_package_manager) - def test_build_distro_package_manager_rhel8(self): - """check distro_package_manager dnf for rhel8""" - self.conf.set_override('base', 'rhel') - self.conf.set_override('base_tag', '8') - kolla = build.KollaWorker(self.conf) - self.assertEqual('dnf', kolla.distro_package_manager) - - def test_build_distro_package_manager_rhel8_minor(self): - """check distro_package_manager dnf for rhel8""" - self.conf.set_override('base', 'rhel') - self.conf.set_override('base_tag', '8.1.2') - kolla = build.KollaWorker(self.conf) - self.assertEqual('dnf', kolla.distro_package_manager) - def test_build_distro_package_manager_debian(self): """check distro_package_manager apt for debian""" self.conf.set_override('base', 'debian') @@ -600,12 +560,6 @@ class KollaWorkerTest(base.TestCase): kolla = build.KollaWorker(self.conf) self.assertEqual('pip', kolla.base_package_type) - def test_base_package_type_rhel(self): - """check base_package_type rpm for rhel""" - self.conf.set_override('base', 'rhel') - kolla = build.KollaWorker(self.conf) - self.assertEqual('rpm', kolla.base_package_type) - def test_base_package_type_debian(self): """check base_package_type deb for debian""" self.conf.set_override('base', 'debian') diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index 65d54a687..1ff8ec30f 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -22,17 +22,6 @@ class MethodsTest(base.TestCase): expectCmd = 'apt-get -y install --no-install-recommends package2.deb' self.assertEqual(expectCmd, result.split("&&")[1].strip()) - def test_enable_repos_rhel(self): - template_vars = { - 'base_arch': 'x86_64', - 'base_distro': 'rhel', - 'base_package_type': 'rpm', - } - - result = methods.handle_repos(template_vars, ['grafana'], 'enable') - expectCmd = '' - self.assertEqual(expectCmd, result) - def test_enable_repos_centos(self): template_vars = { 'base_arch': 'x86_64', |