diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-15 14:02:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-15 14:02:57 +0000 |
| commit | 2f66efdf5e2cef7cf5ca8b44759003c14a103ecf (patch) | |
| tree | 6f3a7cb6ac940ee6e376552250f4524ce9b9125b /kolla/tests/test_methods.py | |
| parent | 4cbb9a5bfdd906c6ebc4c2fc5b0ac4431602bee4 (diff) | |
| parent | 53443c5c712f4ec23b859105e94bcd90abc27762 (diff) | |
| download | kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.tar.gz kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.zip | |
Merge "Remove support for CentOS 7"
Diffstat (limited to 'kolla/tests/test_methods.py')
| -rw-r--r-- | kolla/tests/test_methods.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index bc2021a98..0a1c5bd5a 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -27,7 +27,6 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'rhel', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['grafana'], 'enable') @@ -39,11 +38,10 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'centos', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['grafana'], 'enable') - expectCmd = 'RUN yum-config-manager --enable grafana' + expectCmd = 'RUN dnf config-manager --enable grafana || true' self.assertEqual(expectCmd, result) def test_enable_repos_centos_missing_repo(self): @@ -51,7 +49,6 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'centos', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['missing_repo'], @@ -64,13 +61,12 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'centos', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['grafana', 'ceph'], 'enable') - expectCmd = 'RUN yum-config-manager --enable grafana ' - expectCmd += '--enable centos-ceph-nautilus' + expectCmd = 'RUN dnf config-manager --enable grafana ' + expectCmd += '--enable centos-ceph-nautilus || true' self.assertEqual(expectCmd, result) def test_enable_repos_debian(self): @@ -118,11 +114,10 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'centos', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['grafana'], 'disable') - expectCmd = 'RUN yum-config-manager --disable grafana' + expectCmd = 'RUN dnf config-manager --disable grafana || true' self.assertEqual(expectCmd, result) def test_disable_repos_centos_multiple(self): @@ -130,13 +125,12 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'centos', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['grafana', 'ceph'], 'disable') - expectCmd = 'RUN yum-config-manager --disable grafana ' - expectCmd += '--disable centos-ceph-nautilus' + expectCmd = 'RUN dnf config-manager --disable grafana ' + expectCmd += '--disable centos-ceph-nautilus || true' self.assertEqual(expectCmd, result) # NOTE(hrw): there is no disabling of repos for Debian/Ubuntu |