cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Actually check for equality on empty commands array (#25308)

Browse source
This commit is contained in:
Nathaniel Case 2017-06-06 09:56:44 -04:00 committed by GitHub
parent 0133a5a763
commit f52dcef7ba
7 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/units/modules/network/eos/eos_module.py
View file

@ -75,7 +75,7 @@ class TestEosModule(unittest.TestCase):
result = self.changed(changed) result = self.changed(changed)
self.assertEqual(result['changed'], changed, result) self.assertEqual(result['changed'], changed, result)
if commands: if commands is not None:
if sort: if sort:
self.assertEqual(sorted(commands), sorted(result['commands']), result['commands']) self.assertEqual(sorted(commands), sorted(result['commands']), result['commands'])
else: else:

6
test/units/modules/network/eos/test_eos_eapi.py
View file

@ -95,8 +95,7 @@ class TestEosEapiModule(TestEosModule):
def test_eos_eapi_http_invalid(self): def test_eos_eapi_http_invalid(self):
set_module_args(dict(http_port=80000)) set_module_args(dict(http_port=80000))
commands = [] self.start_unconfigured(failed=True)
self.start_unconfigured(failed=True, commands=commands)
def test_eos_eapi_https_enable(self): def test_eos_eapi_https_enable(self):
set_module_args(dict(https=True)) set_module_args(dict(https=True))
@ -137,8 +136,7 @@ class TestEosEapiModule(TestEosModule):
def test_eos_eapi_vrf_missing(self): def test_eos_eapi_vrf_missing(self):
set_module_args(dict(vrf='missing')) set_module_args(dict(vrf='missing'))
commands = [] self.start_unconfigured(failed=True)
self.start_unconfigured(failed=True, commands=commands)
def test_eos_eapi_state_absent(self): def test_eos_eapi_state_absent(self):
set_module_args(dict(state='stopped')) set_module_args(dict(state='stopped'))

2
test/units/modules/network/ios/ios_module.py
View file

@ -75,7 +75,7 @@ class TestIosModule(unittest.TestCase):
result = self.changed(changed) result = self.changed(changed)
self.assertEqual(result['changed'], changed, result) self.assertEqual(result['changed'], changed, result)
if commands: if commands is not None:
if sort: if sort:
self.assertEqual(sorted(commands), sorted(result['commands']), result['commands']) self.assertEqual(sorted(commands), sorted(result['commands']), result['commands'])
else: else:

2
test/units/modules/network/iosxr/iosxr_module.py
View file

@ -75,7 +75,7 @@ class TestIosxrModule(unittest.TestCase):
result = self.changed(changed) result = self.changed(changed)
self.assertEqual(result['changed'], changed, result) self.assertEqual(result['changed'], changed, result)
if commands: if commands is not None:
if sort: if sort:
self.assertEqual(sorted(commands), sorted(result['commands']), result['commands']) self.assertEqual(sorted(commands), sorted(result['commands']), result['commands'])
else: else:

2
test/units/modules/network/nxos/nxos_module.py
View file

@ -75,7 +75,7 @@ class TestNxosModule(unittest.TestCase):
result = self.changed(changed) result = self.changed(changed)
self.assertEqual(result['changed'], changed, result) self.assertEqual(result['changed'], changed, result)
if commands: if commands is not None:
if sort: if sort:
self.assertEqual(sorted(commands), sorted(result['commands']), result['commands']) self.assertEqual(sorted(commands), sorted(result['commands']), result['commands'])
else: else:

2
test/units/modules/network/ovs/ovs_module.py
View file

@ -76,7 +76,7 @@ class TestOpenVSwitchModule(unittest.TestCase):
result = self.changed(changed) result = self.changed(changed)
self.assertEqual(result['changed'], changed, result) self.assertEqual(result['changed'], changed, result)
if commands: if commands is not None:
self.assertEqual(commands, result['commands'], result['commands']) self.assertEqual(commands, result['commands'], result['commands'])
return result return result

2
test/units/modules/network/vyos/vyos_module.py
View file

@ -74,7 +74,7 @@ class TestVyosModule(unittest.TestCase):
result = self.changed(changed) result = self.changed(changed)
self.assertEqual(result['changed'], changed, result) self.assertEqual(result['changed'], changed, result)
if commands: if commands is not None:
if sort: if sort:
self.assertEqual(sorted(commands), sorted(result['commands']), result['commands']) self.assertEqual(sorted(commands), sorted(result['commands']), result['commands'])
else: else: