openstack/rally-openstack
Code Issues Proposed changes

Merge "[CI][cli] use env variable to determine KeystoneV3"

Browse Source
This commit is contained in:
Jenkins 2016-12-06 01:16:32 +00:00 committed by Gerrit Code Review
commit 33901857fe
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/functional/test_cli_deployment.py
View File

@ -50,6 +50,12 @@ class DeploymentTestCase(unittest.TestCase):
config["admin"]["username"]) config["admin"]["username"])
self.assertEqual(utils.TEST_ENV["OS_PASSWORD"], self.assertEqual(utils.TEST_ENV["OS_PASSWORD"],
config["admin"]["password"]) config["admin"]["password"])
if "project_name" in config["admin"]:
# keystone v3
self.assertEqual(utils.TEST_ENV["OS_TENANT_NAME"],
config["admin"]["project_name"])
else:
# keystone v2
self.assertEqual(utils.TEST_ENV["OS_TENANT_NAME"], self.assertEqual(utils.TEST_ENV["OS_TENANT_NAME"],
config["admin"]["tenant_name"]) config["admin"]["tenant_name"])
self.assertEqual(utils.TEST_ENV["OS_AUTH_URL"], self.assertEqual(utils.TEST_ENV["OS_AUTH_URL"],