Clean up flake8 errors on ios unit tests (#65782)

This was caught during our collection migration process.

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2019-12-12 19:26:54 -05:00 committed by GitHub
parent 057e137998
commit ea164fdde7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 19 deletions

View file

@ -79,16 +79,6 @@ class TestIosConfigModule(TestIosModule):
result = self.execute_module() result = self.execute_module()
self.assertIn('__backup__', result) self.assertIn('__backup__', result)
def test_ios_config_save_always(self):
self.run_commands.return_value = "Hostname foo"
set_module_args(dict(save_when='always'))
self.execute_module(changed=True)
self.assertEqual(self.run_commands.call_count, 1)
self.assertEqual(self.get_config.call_count, 0)
self.assertEqual(self.conn.edit_config.call_count, 0)
args = self.run_commands.call_args[0][1]
self.assertIn('copy running-config startup-config\r', args)
def test_ios_config_save_changed_true(self): def test_ios_config_save_changed_true(self):
src = load_fixture('ios_config_src.cfg') src = load_fixture('ios_config_src.cfg')
set_module_args(dict(src=src, save_when='changed')) set_module_args(dict(src=src, save_when='changed'))
@ -188,7 +178,7 @@ class TestIosConfigModule(TestIosModule):
self.conn.get_diff = MagicMock(return_value=self.cliconf_obj.get_diff('\n'.join(lines), self.running_config, diff_match='none')) self.conn.get_diff = MagicMock(return_value=self.cliconf_obj.get_diff('\n'.join(lines), self.running_config, diff_match='none'))
self.execute_module(changed=True, commands=lines) self.execute_module(changed=True, commands=lines)
def test_ios_config_match_none(self): def test_ios_config_match_none2(self):
lines = ['ip address 1.2.3.4 255.255.255.0', 'description test string'] lines = ['ip address 1.2.3.4 255.255.255.0', 'description test string']
parents = ['interface GigabitEthernet0/0'] parents = ['interface GigabitEthernet0/0']
set_module_args(dict(lines=lines, parents=parents, match='none')) set_module_args(dict(lines=lines, parents=parents, match='none'))
@ -232,29 +222,29 @@ class TestIosConfigModule(TestIosModule):
def test_ios_config_src_and_lines_fails(self): def test_ios_config_src_and_lines_fails(self):
args = dict(src='foo', lines='foo') args = dict(src='foo', lines='foo')
set_module_args(args) set_module_args(args)
result = self.execute_module(failed=True) self.execute_module(failed=True)
def test_ios_config_src_and_parents_fails(self): def test_ios_config_src_and_parents_fails(self):
args = dict(src='foo', parents='foo') args = dict(src='foo', parents='foo')
set_module_args(args) set_module_args(args)
result = self.execute_module(failed=True) self.execute_module(failed=True)
def test_ios_config_match_exact_requires_lines(self): def test_ios_config_match_exact_requires_lines(self):
args = dict(match='exact') args = dict(match='exact')
set_module_args(args) set_module_args(args)
result = self.execute_module(failed=True) self.execute_module(failed=True)
def test_ios_config_match_strict_requires_lines(self): def test_ios_config_match_strict_requires_lines(self):
args = dict(match='strict') args = dict(match='strict')
set_module_args(args) set_module_args(args)
result = self.execute_module(failed=True) self.execute_module(failed=True)
def test_ios_config_replace_block_requires_lines(self): def test_ios_config_replace_block_requires_lines(self):
args = dict(replace='block') args = dict(replace='block')
set_module_args(args) set_module_args(args)
result = self.execute_module(failed=True) self.execute_module(failed=True)
def test_ios_config_replace_config_requires_src(self): def test_ios_config_replace_config_requires_src(self):
args = dict(replace='config') args = dict(replace='config')
set_module_args(args) set_module_args(args)
result = self.execute_module(failed=True) self.execute_module(failed=True)

View file

@ -56,7 +56,6 @@ class TestIosFactsModule(TestIosModule):
def load_fixtures(self, commands=None): def load_fixtures(self, commands=None):
def load_from_file(*args, **kwargs): def load_from_file(*args, **kwargs):
module = args
commands = kwargs['commands'] commands = kwargs['commands']
output = list() output = list()

View file

@ -41,7 +41,6 @@ class TestIosPingModule(TestIosModule):
def load_fixtures(self, commands=None): def load_fixtures(self, commands=None):
def load_from_file(*args, **kwargs): def load_from_file(*args, **kwargs):
module = args
commands = kwargs['commands'] commands = kwargs['commands']
output = list() output = list()