openstack/python-novaclient
Code Issues Proposed changes

tests: Remove use of ddt

Browse Source 
Change-Id: I8a2616728fe904e971dbedb650247b89a9dcd525
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
2025-06-24 08:01:31 +01:00
parent d54efa9f58
commit 51e9d269da
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
novaclient/tests/unit/test_shell.py
View File

@@ -17,7 +17,6 @@ import re
import sys
from unittest import mock
import ddt
import fixtures
from keystoneauth1 import fixture
import requests_mock
@@ -352,7 +351,6 @@ class ParserTest(utils.TestCase):
self.assertTrue(args.tic_tac)
@ddt.ddt
class ShellTest(utils.TestCase):
_msg_no_tenant_project = ("You must provide a project name or project"
@@ -528,22 +526,23 @@ class ShellTest(utils.TestCase):
else:
self.fail('CommandError not raised')
@ddt.data(
(None, 'project_domain_id', FAKE_ENV['OS_PROJECT_DOMAIN_ID']),
('OS_PROJECT_DOMAIN_ID', 'project_domain_id', ''),
(None, 'project_domain_name', FAKE_ENV['OS_PROJECT_DOMAIN_NAME']),
('OS_PROJECT_DOMAIN_NAME', 'project_domain_name', ''),
(None, 'user_domain_id', FAKE_ENV['OS_USER_DOMAIN_ID']),
('OS_USER_DOMAIN_ID', 'user_domain_id', ''),
(None, 'user_domain_name', FAKE_ENV['OS_USER_DOMAIN_NAME']),
('OS_USER_DOMAIN_NAME', 'user_domain_name', '')
)
@ddt.unpack
def test_basic_attributes(self, exclude, client_arg, env_var):
self.make_env(exclude=exclude, fake_env=FAKE_ENV)
self.shell('list')
client_kwargs = self.mock_client.call_args_list[0][1]
self.assertEqual(env_var, client_kwargs[client_arg])
def test_basic_attributes(self):
for exclude, client_arg, env_var in (
(None, 'project_domain_id', FAKE_ENV['OS_PROJECT_DOMAIN_ID']),
('OS_PROJECT_DOMAIN_ID', 'project_domain_id', ''),
(None, 'project_domain_name', FAKE_ENV['OS_PROJECT_DOMAIN_NAME']),
('OS_PROJECT_DOMAIN_NAME', 'project_domain_name', ''),
(None, 'user_domain_id', FAKE_ENV['OS_USER_DOMAIN_ID']),
('OS_USER_DOMAIN_ID', 'user_domain_id', ''),
(None, 'user_domain_name', FAKE_ENV['OS_USER_DOMAIN_NAME']),
('OS_USER_DOMAIN_NAME', 'user_domain_name', '')
):
with self.subTest(f'{exclude},{client_arg},{env_var}'):
self.mock_client.reset_mock()
self.make_env(exclude=exclude, fake_env=FAKE_ENV)
self.shell('list')
client_kwargs = self.mock_client.call_args_list[0][1]
self.assertEqual(env_var, client_kwargs[client_arg])
@requests_mock.Mocker()
def test_nova_endpoint_type(self, m_requests):

1
test-requirements.txt
View File

@@ -1,5 +1,4 @@
coverage>=4.4.1 # Apache-2.0
ddt>=1.0.1 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD
requests-mock>=1.2.0 # Apache-2.0
openstacksdk>=0.11.2 # Apache-2.0