mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
test and lint fixes
This commit is contained in:
parent
8ee48432f4
commit
7f6961378e
@ -25,34 +25,54 @@ class CertUtilTestCase(TestCase):
|
||||
'''
|
||||
Test getting the serial number from a certificate
|
||||
'''
|
||||
expected = 'XYZABC'
|
||||
mock = MagicMock(return_value='CertInfo\r\nSerial: XYZABC\r\nOtherStuff')
|
||||
expected = '180720d39cd2db3244ba037417241e90'
|
||||
mock = MagicMock(return_value=(
|
||||
'CertInfo\r\n'
|
||||
'================ Certificate 0 ================\r\n'
|
||||
'Serial Number: 180720d39cd2db3244ba037417241e90\r\n'
|
||||
'OtherStuff'))
|
||||
with patch.dict(certutil.__salt__, {'cmd.run': mock}):
|
||||
out = certutil.get_cert_serial('/path/to/cert.cer')
|
||||
mock.assert_called_once_with('certutil.exe -verify /path/to/cert.cer')
|
||||
mock.assert_called_once_with(
|
||||
'certutil.exe -silent -verify /path/to/cert.cer')
|
||||
self.assertEqual(expected, out)
|
||||
|
||||
def test_get_serials(self):
|
||||
'''
|
||||
Test getting the all the serial numbers from a store
|
||||
'''
|
||||
expected = ['XYZABC', '123456']
|
||||
mock = MagicMock(return_value='CertInfo\r\nSerial Number: XYZABC\r\nSerial Number: 123456\r\n')
|
||||
expected = ['180720d39cd2db3244ba037417241e90',
|
||||
'1768ac4e5b72bf1d0df0df118b34b959']
|
||||
mock = MagicMock(return_value=(
|
||||
'CertInfo\r\n'
|
||||
'================ Certificate 0 ================\r\n'
|
||||
'Serial Number: 180720d39cd2db3244ba037417241e90\r\n'
|
||||
'OtherStuff\r\n'
|
||||
'\r\n'
|
||||
'================ Certificate 1 ================\r\n'
|
||||
'Serial Number: 1768ac4e5b72bf1d0df0df118b34b959\r\n'
|
||||
'OtherStuff'))
|
||||
with patch.dict(certutil.__salt__, {'cmd.run': mock}):
|
||||
out = certutil.get_stored_cert_serials('TrustedPublisher')
|
||||
mock.assert_called_once_with('certutil.exe -store TrustedPublisher')
|
||||
mock.assert_called_once_with(
|
||||
'certutil.exe -store TrustedPublisher')
|
||||
self.assertEqual(expected, out)
|
||||
|
||||
def test_add_store(self):
|
||||
'''
|
||||
Test adding a certificate to a specific store
|
||||
'''
|
||||
cmd_mock = MagicMock(return_value='CertInfo\r\nSerial: XYZABC\r\nOtherStuff')
|
||||
cmd_mock = MagicMock(return_value=(
|
||||
'CertInfo\r\n'
|
||||
'================ Certificate 0 ================\r\n'
|
||||
'Serial Number: 180720d39cd2db3244ba037417241e90\r\n'
|
||||
'OtherStuff'))
|
||||
cache_mock = MagicMock(return_value='/tmp/cert.cer')
|
||||
with patch.dict(certutil.__salt__, {'cmd.run': cmd_mock,
|
||||
'cp.cache_file': cache_mock}):
|
||||
certutil.add_store('salt://path/to/file', 'TrustedPublisher')
|
||||
cmd_mock.assert_called_once_with('certutil.exe -addstore TrustedPublisher /tmp/cert.cer')
|
||||
cmd_mock.assert_called_once_with(
|
||||
'certutil.exe -addstore TrustedPublisher /tmp/cert.cer')
|
||||
cache_mock.assert_called_once_with('salt://path/to/file', 'base')
|
||||
|
||||
@patch('salt.modules.win_certutil.get_cert_serial')
|
||||
@ -60,13 +80,18 @@ class CertUtilTestCase(TestCase):
|
||||
'''
|
||||
Test removing a certificate to a specific store
|
||||
'''
|
||||
cmd_mock = MagicMock(return_value='CertInfo\r\nSerial: XYZABC\r\nOtherStuff')
|
||||
cmd_mock = MagicMock(return_value=(
|
||||
'CertInfo\r\n'
|
||||
'================ Certificate 0 ================\r\n'
|
||||
'Serial Number: 180720d39cd2db3244ba037417241e90\r\n'
|
||||
'OtherStuff'))
|
||||
cache_mock = MagicMock(return_value='/tmp/cert.cer')
|
||||
cert_serial_mock.return_value = "ABCDEF"
|
||||
cert_serial_mock.return_value = 'ABCDEF'
|
||||
with patch.dict(certutil.__salt__, {'cmd.run': cmd_mock,
|
||||
'cp.cache_file': cache_mock}):
|
||||
certutil.del_store('salt://path/to/file', 'TrustedPublisher')
|
||||
cmd_mock.assert_called_once_with('certutil.exe -delstore TrustedPublisher ABCDEF')
|
||||
cmd_mock.assert_called_once_with(
|
||||
'certutil.exe -delstore TrustedPublisher ABCDEF')
|
||||
cache_mock.assert_called_once_with('salt://path/to/file', 'base')
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user