From c5d61953b1f0ec95609e3354b1faa2727b5f54a0 Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Wed, 6 Nov 2019 13:34:16 +0100 Subject: [PATCH] Remove empty setUp/tearDown/tearDownClass methods in test classes. --- test/units/executor/test_play_iterator.py | 6 ------ test/units/executor/test_task_executor.py | 6 ------ .../network/netscaler/test_netscaler_nitro_request.py | 8 +------- test/units/parsing/test_dataloader.py | 3 --- test/units/playbook/role/test_role.py | 6 ------ test/units/playbook/test_playbook.py | 6 ------ test/units/plugins/lookup/test_ini.py | 6 ------ test/units/plugins/lookup/test_lastpass.py | 6 ------ test/units/plugins/strategy/test_strategy_base.py | 6 ------ test/units/plugins/strategy/test_strategy_linear.py | 6 ------ test/units/plugins/terminal/test_slxos.py | 3 --- test/units/plugins/test_plugins.py | 6 ------ test/units/utils/test_vars.py | 6 ------ test/units/vars/test_variable_manager.py | 6 ------ 14 files changed, 1 insertion(+), 79 deletions(-) diff --git a/test/units/executor/test_play_iterator.py b/test/units/executor/test_play_iterator.py index 4b4205f1197..4ccfd69a96f 100644 --- a/test/units/executor/test_play_iterator.py +++ b/test/units/executor/test_play_iterator.py @@ -32,12 +32,6 @@ from units.mock.path import mock_unfrackpath_noop class TestPlayIterator(unittest.TestCase): - def setUp(self): - pass - - def tearDown(self): - pass - def test_host_state(self): hs = HostState(blocks=[x for x in range(0, 10)]) hs.tasks_child_state = HostState(blocks=[0]) diff --git a/test/units/executor/test_task_executor.py b/test/units/executor/test_task_executor.py index dfbcebef6d0..512f137f841 100644 --- a/test/units/executor/test_task_executor.py +++ b/test/units/executor/test_task_executor.py @@ -35,12 +35,6 @@ from units.mock.loader import DictDataLoader class TestTaskExecutor(unittest.TestCase): - def setUp(self): - pass - - def tearDown(self): - pass - def test_task_executor_init(self): fake_loader = DictDataLoader({}) mock_host = MagicMock() diff --git a/test/units/modules/network/netscaler/test_netscaler_nitro_request.py b/test/units/modules/network/netscaler/test_netscaler_nitro_request.py index 9c024f4bb77..cf0bf548b14 100644 --- a/test/units/modules/network/netscaler/test_netscaler_nitro_request.py +++ b/test/units/modules/network/netscaler/test_netscaler_nitro_request.py @@ -56,16 +56,10 @@ class TestNetscalerNitroRequestModule(TestModule): cls.MockException = MockException - @classmethod - def tearDownClass(cls): - pass - + # This has code in a parent class def setUp(self): pass - def tearDown(self): - pass - def test_fail_on_conflicting_authentication_methods(self): args = copy.deepcopy(module_arguments) args.update(dict( diff --git a/test/units/parsing/test_dataloader.py b/test/units/parsing/test_dataloader.py index ebc407655b9..5dfee94292f 100644 --- a/test/units/parsing/test_dataloader.py +++ b/test/units/parsing/test_dataloader.py @@ -39,9 +39,6 @@ class TestDataLoader(unittest.TestCase): def setUp(self): self._loader = DataLoader() - def tearDown(self): - pass - @patch('os.path.exists') def test__is_role(self, p_exists): p_exists.side_effect = lambda p: p == b'test_path/tasks/main.yml' diff --git a/test/units/playbook/role/test_role.py b/test/units/playbook/role/test_role.py index 5abad1c66e7..3aa30b8b391 100644 --- a/test/units/playbook/role/test_role.py +++ b/test/units/playbook/role/test_role.py @@ -166,12 +166,6 @@ class TestHashParams(unittest.TestCase): class TestRole(unittest.TestCase): - def setUp(self): - pass - - def tearDown(self): - pass - @patch('ansible.playbook.role.definition.unfrackpath', mock_unfrackpath_noop) def test_load_role_with_tasks(self): diff --git a/test/units/playbook/test_playbook.py b/test/units/playbook/test_playbook.py index 3cd745a7d5a..68a9fb75832 100644 --- a/test/units/playbook/test_playbook.py +++ b/test/units/playbook/test_playbook.py @@ -29,12 +29,6 @@ from units.mock.loader import DictDataLoader class TestPlaybook(unittest.TestCase): - def setUp(self): - pass - - def tearDown(self): - pass - def test_empty_playbook(self): fake_loader = DictDataLoader({}) p = Playbook(loader=fake_loader) diff --git a/test/units/plugins/lookup/test_ini.py b/test/units/plugins/lookup/test_ini.py index 3902dd29b0e..adf2bac2ae2 100644 --- a/test/units/plugins/lookup/test_ini.py +++ b/test/units/plugins/lookup/test_ini.py @@ -55,12 +55,6 @@ class TestINILookup(unittest.TestCase): ), ) - def setUp(self): - pass - - def tearDown(self): - pass - def test_parse_parameters(self): for testcase in self.old_style_params_data: # print(testcase) diff --git a/test/units/plugins/lookup/test_lastpass.py b/test/units/plugins/lookup/test_lastpass.py index d8d708d32b1..7de54d0fc55 100644 --- a/test/units/plugins/lookup/test_lastpass.py +++ b/test/units/plugins/lookup/test_lastpass.py @@ -126,12 +126,6 @@ class LoggedOutMockLPass(MockLPass): class TestLPass(unittest.TestCase): - def setUp(self): - pass - - def tearDown(self): - pass - def test_lastpass_cli_path(self): lp = MockLPass(path='/dev/null') self.assertEqual('/dev/null', lp.cli_path) diff --git a/test/units/plugins/strategy/test_strategy_base.py b/test/units/plugins/strategy/test_strategy_base.py index 33776ba54f1..3b6b7cb6429 100644 --- a/test/units/plugins/strategy/test_strategy_base.py +++ b/test/units/plugins/strategy/test_strategy_base.py @@ -36,12 +36,6 @@ from ansible.plugins.strategy import StrategyBase class TestStrategyBase(unittest.TestCase): - def setUp(self): - pass - - def tearDown(self): - pass - def test_strategy_base_init(self): queue_items = [] diff --git a/test/units/plugins/strategy/test_strategy_linear.py b/test/units/plugins/strategy/test_strategy_linear.py index df95c2676c5..74887030ef5 100644 --- a/test/units/plugins/strategy/test_strategy_linear.py +++ b/test/units/plugins/strategy/test_strategy_linear.py @@ -21,12 +21,6 @@ from units.mock.path import mock_unfrackpath_noop class TestStrategyLinear(unittest.TestCase): - def setUp(self): - pass - - def tearDown(self): - pass - @patch('ansible.playbook.role.definition.unfrackpath', mock_unfrackpath_noop) def test_noop(self): fake_loader = DictDataLoader({ diff --git a/test/units/plugins/terminal/test_slxos.py b/test/units/plugins/terminal/test_slxos.py index 59879715e94..d886fe06ff2 100644 --- a/test/units/plugins/terminal/test_slxos.py +++ b/test/units/plugins/terminal/test_slxos.py @@ -33,9 +33,6 @@ class TestPluginTerminalSLXOS(unittest.TestCase): self._mock_connection = MagicMock() self._terminal = slxos.TerminalModule(self._mock_connection) - def tearDown(self): - pass - def test_on_open_shell(self): """ Test on_open_shell """ diff --git a/test/units/plugins/test_plugins.py b/test/units/plugins/test_plugins.py index 03d627c5f74..51548500d22 100644 --- a/test/units/plugins/test_plugins.py +++ b/test/units/plugins/test_plugins.py @@ -30,12 +30,6 @@ from ansible.plugins.loader import PluginLoader class TestErrors(unittest.TestCase): - def setUp(self): - pass - - def tearDown(self): - pass - @patch.object(PluginLoader, '_get_paths') def test_print_paths(self, mock_method): mock_method.return_value = ['/path/one', '/path/two', '/path/three'] diff --git a/test/units/utils/test_vars.py b/test/units/utils/test_vars.py index dc5a249039b..812c1670211 100644 --- a/test/units/utils/test_vars.py +++ b/test/units/utils/test_vars.py @@ -64,12 +64,6 @@ class TestVariableUtils(unittest.TestCase): ), ) - def setUp(self): - pass - - def tearDown(self): - pass - def test_merge_hash(self): for test in self.test_merge_data: self.assertEqual(merge_hash(test['a'], test['b']), test['result']) diff --git a/test/units/vars/test_variable_manager.py b/test/units/vars/test_variable_manager.py index 50ec14b641c..65a79286c93 100644 --- a/test/units/vars/test_variable_manager.py +++ b/test/units/vars/test_variable_manager.py @@ -36,12 +36,6 @@ from ansible.vars.manager import VariableManager class TestVariableManager(unittest.TestCase): - def setUp(self): - pass - - def tearDown(self): - pass - def test_basic_manager(self): fake_loader = DictDataLoader({})