2 files changed, 38 insertions, 3 deletions
diff --git a/openstackclient/tests/functional/base.py b/openstackclient/tests/functional/base.py
index 1414e6bb..c34ca393 100644
--- a/openstackclient/tests/functional/base.py
+++ b/openstackclient/tests/functional/base.py
@@ -45,9 +45,17 @@ class TestCase(testtools.TestCase):
     @classmethod
     def openstack(cls, cmd, cloud=ADMIN_CLOUD, fail_ok=False):
         """Executes openstackclient command for the given action."""
-        return execute(
-            'openstack --os-cloud={cloud} '.format(cloud=cloud) +
-            cmd, fail_ok=fail_ok)
+        if cloud is not None:
+            return execute(
+                'openstack --os-cloud={cloud} '.format(cloud=cloud) + cmd,
+                fail_ok=fail_ok
+            )
+        else:
+            # Execute command with no auth
+            return execute(
+                'openstack --os-auth-type none ' + cmd,
+                fail_ok=fail_ok
+            )
 
     @classmethod
     def is_service_enabled(cls, service):
diff --git a/openstackclient/tests/functional/common/test_configuration.py b/openstackclient/tests/functional/common/test_configuration.py
index 63a17d0e..17e0f45d 100644
--- a/openstackclient/tests/functional/common/test_configuration.py
+++ b/openstackclient/tests/functional/common/test_configuration.py
@@ -37,6 +37,10 @@ class ConfigurationTests(base.TestCase):
             configuration.REDACTED,
             cmd_output['auth.password']
         )
+        self.assertIn(
+            'auth.password',
+            cmd_output.keys(),
+        )
 
         # Test show --mask
         cmd_output = json.loads(self.openstack(
@@ -65,3 +69,26 @@ class ConfigurationTests(base.TestCase):
                 configuration.REDACTED,
                 cmd_output['auth.password']
             )
+
+
+class ConfigurationTestsNoAuth(base.TestCase):
+    """Functional test for configuration with no auth"""
+
+    def test_configuration_show(self):
+
+        # Test show without option
+        raw_output = self.openstack(
+            'configuration show',
+            cloud=None,
+        )
+        items = self.parse_listing(raw_output)
+        self.assert_table_structure(items, BASIC_CONFIG_HEADERS)
+
+        cmd_output = json.loads(self.openstack(
+            'configuration show -f json',
+            cloud=None,
+        ))
+        self.assertNotIn(
+            'auth.password',
+            cmd_output,
+        )