openstack/swift
Code Issues Proposed changes

Remove unnecessary loop in test_keymaster.py

Browse Source 
The ignored_secret variable wasn't being used.

Change-Id: Ia659f3672941f9bb86054ce6cafbbe6fe7ccafbc
Related-Change: I1cd9a97c4e8d87d7c065866e7ad3a9e748ff19ab
This commit is contained in:
Alistair Coles
2018-06-25 12:13:59 +01:00
parent 3de21d945b
commit 1fa4b9e3fe
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/unit/common/middleware/crypto/test_keymaster.py
View File

@@ -153,20 +153,18 @@ class TestKeymaster(unittest.TestCase):
for conf_val in (bytes(enc_secret), unicode(enc_secret), for conf_val in (bytes(enc_secret), unicode(enc_secret),
enc_secret[:30] + '\n' + enc_secret[30:], enc_secret[:30] + '\n' + enc_secret[30:],
enc_secret[:30] + '\r\n' + enc_secret[30:]): enc_secret[:30] + '\r\n' + enc_secret[30:]):
for ignored_secret in ('invalid! but ignored!', mock_readconf.reset_mock()
'xValidButIgnored' * 10): mock_readconf.return_value = {
mock_readconf.reset_mock() 'encryption_root_secret': conf_val}
mock_readconf.return_value = {
'encryption_root_secret': conf_val}
app = keymaster.KeyMaster(self.swift, { app = keymaster.KeyMaster(self.swift, {
'keymaster_config_path': '/some/path'}) 'keymaster_config_path': '/some/path'})
try: try:
self.assertEqual(secret, app.root_secret) self.assertEqual(secret, app.root_secret)
self.assertEqual(mock_readconf.mock_calls, [ self.assertEqual(mock_readconf.mock_calls, [
mock.call('/some/path', 'keymaster')]) mock.call('/some/path', 'keymaster')])
except AssertionError as err: except AssertionError as err:
self.fail(str(err) + ' for secret %r' % secret) self.fail(str(err) + ' for secret %r' % secret)
def test_invalid_root_secret(self): def test_invalid_root_secret(self):
for secret in (bytes(base64.b64encode(os.urandom(31))), # too short for secret in (bytes(base64.b64encode(os.urandom(31))), # too short