openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Remove six library from requirements.txt

Browse Source 
Six is unused in the code, and generally unused in all of
Openstack, so remove it.

Fixed bad code in test_save_script_rc_base() that was
causing a test failure.

Change-Id: Ifff5f4234a14b5ef477a6451cb882780b6a92601
This commit is contained in:
Brian Haley 2024-08-07 13:00:36 -04:00
parent 532026ffbb
commit f4f9e7c116
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/nova_cc_utils.py
View File

@ -78,7 +78,6 @@ PY3_PACKAGES = [
'python3-novaclient',
'python3-keystoneclient',
'python3-psutil',
'python3-six',
'python3-memcache',
]

1
requirements.txt
View File

@ -22,7 +22,6 @@ cryptography<3.4
netaddr>0.7.16,<0.8.0
Jinja2>=2.6 # BSD License (3 clause)
six>=1.9.0
dnspython

7
unit_tests/test_nova_cc_utils.py
View File

@ -67,7 +67,7 @@ TO_PATCH = [
]
SCRIPTRC_ENV_VARS = {
'OPENSTACK_PORT_MASTPORT': 5404,
'OPENSTACK_PORT_MCASTPORT': 5404,
'OPENSTACK_SERVICE_API_EC2': 'nova-api-ec2',
'OPENSTACK_SERVICE_API_OS_COMPUTE': 'nova-api-os-compute',
'OPENSTACK_SERVICE_CERT': 'nova-cert',
@ -645,10 +645,11 @@ class NovaCCUtilsTests(CharmTestCase):
ex = [8773, 8774]
self.assertEqual(ex, sorted(ports))
def test_save_script_rc_base(self):
@patch('charmhelpers.contrib.openstack.utils.save_script_rc')
def test_save_script_rc_base(self, save_script_rc):
self.relation_ids.return_value = []
utils.save_script_rc()
self.save_script_rc.called_with(**SCRIPTRC_ENV_VARS)
save_script_rc.assert_called_with(**SCRIPTRC_ENV_VARS)
@patch('charmhelpers.contrib.openstack.utils.lsb_release')
def test_get_step_upgrade_source_target_liberty(self, lsb_release):