openstack/python-openstackclient
Code Issues Proposed changes

Merge "Have configuration tests support OCC"

Browse Source
This commit is contained in:
Jenkins 2015-11-21 01:17:57 +00:00 committed by Gerrit Code Review
commit 4c7bbdae28
1 changed files with 9 additions and 3 deletions

12
functional/tests/common/test_configuration.py

@ -30,9 +30,15 @@ class ConfigurationTests(test.TestCase):
def test_configuration_show_unmask(self):
raw_output = self.openstack('configuration show --unmask ' + self.opts)
passwd = os.environ['OS_PASSWORD']
self.assertOutput(passwd + '\n', raw_output)
# If we are using os-client-config, this will not be set. Rather than
# parse clouds.yaml to get the right value, just make sure
# we are not getting redacted.
passwd = os.environ.get('OS_PASSWORD')
if passwd:
self.assertEqual(passwd + '\n', raw_output)
else:
self.assertNotEqual(configuration.REDACTED + '\n', raw_output)
def test_configuration_show_mask(self):
raw_output = self.openstack('configuration show --mask ' + self.opts)
self.assertOutput(configuration.REDACTED + '\n', raw_output)
self.assertEqual(configuration.REDACTED + '\n', raw_output)