x/cloudbase-init
Code Issues Proposed changes

Fixes Python 3.x support in test_winrmconfig

Browse Source 
Adds sorting to lists to be compared and some minor refactoring.
This commit is contained in:
Alessandro Pilotti 2014-09-08 17:47:35 +03:00
parent 98cce09c12
commit b27d90b41f
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cloudbaseinit/tests/utils/windows/test_winrmconfig.py
View File

@ -334,20 +334,16 @@ class WinRMConfigTests(unittest.TestCase):
mock_session = mock.MagicMock() mock_session = mock.MagicMock()
mock_tree = mock.MagicMock() mock_tree = mock.MagicMock()
mock_node = mock.MagicMock() mock_node = mock.MagicMock()
base_url = 'http://schemas.microsoft.com/wbem/wsman/1/config/service/' url = 'http://schemas.microsoft.com/wbem/wsman/1/config/service/auth'
expected_find = [ expected_find = [
mock.call('.//cfg:Certificate', namespaces={ mock.call('.//cfg:Certificate', namespaces={'cfg': url}),
'cfg': base_url + 'auth'}), mock.call('.//cfg:Kerberos', namespaces={'cfg': url}),
mock.call('.//cfg:Kerberos', mock.call('.//cfg:CbtHardeningLevel', namespaces={'cfg': url}),
namespaces={'cfg': base_url + 'auth'}), mock.call('.//cfg:Negotiate', namespaces={'cfg': url}),
mock.call('.//cfg:CbtHardeningLevel', mock.call('.//cfg:CredSSP', namespaces={'cfg': url}),
namespaces={'cfg': base_url + 'auth'}), mock.call('.//cfg:Basic', namespaces={'cfg': url})]
mock.call('.//cfg:Negotiate',
namespaces={'cfg': base_url + 'auth'}),
mock.call('.//cfg:CredSSP',
namespaces={'cfg': base_url + 'auth'}),
mock.call('.//cfg:Basic',
namespaces={'cfg': base_url + 'auth'})]
expected_get_xml_bool = [mock.call('certificate'), expected_get_xml_bool = [mock.call('certificate'),
mock.call('kerberos'), mock.call('kerberos'),
mock.call('cbt_hardening_level'), mock.call('cbt_hardening_level'),
@ -367,9 +363,11 @@ class WinRMConfigTests(unittest.TestCase):
basic='basic', kerberos='kerberos', negotiate='negotiate', basic='basic', kerberos='kerberos', negotiate='negotiate',
certificate='certificate', credSSP='credSSP', certificate='certificate', credSSP='credSSP',
cbt_hardening_level='cbt_hardening_level') cbt_hardening_level='cbt_hardening_level')
self.assertEqual(mock_tree.find.call_args_list, expected_find)
self.assertEqual(mock_get_xml_bool.call_args_list, self.assertEqual(sorted(expected_find),
expected_get_xml_bool) sorted(mock_tree.find.call_args_list))
self.assertEqual(sorted(expected_get_xml_bool),
sorted(mock_get_xml_bool.call_args_list))
mock_get_wsman_session.assert_called_once_with() mock_get_wsman_session.assert_called_once_with()
mock_session.Get.assert_called_with( mock_session.Get.assert_called_with(