openstack/python-openstackclient
Code Issues Proposed changes

Have configuration tests support OCC

Browse Source 
Change-Id: Ia8b0e5672e2e6cf6a37582bf231385aafda8836d
This commit is contained in:
TerryHowe 2015-08-21 11:05:36 -06:00 committed by Dean Troyer
parent 3751dbf127
commit c0cc538077
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): def test_configuration_show_unmask(self):
raw_output = self.openstack('configuration show --unmask ' + self.opts) raw_output = self.openstack('configuration show --unmask ' + self.opts)
passwd = os.environ['OS_PASSWORD'] # If we are using os-client-config, this will not be set. Rather than
self.assertOutput(passwd + '\n', raw_output) # 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): def test_configuration_show_mask(self):
raw_output = self.openstack('configuration show --mask ' + self.opts) raw_output = self.openstack('configuration show --mask ' + self.opts)
self.assertOutput(configuration.REDACTED + '\n', raw_output) self.assertEqual(configuration.REDACTED + '\n', raw_output)