diff options
| author | Aaron Rosen <aaronorosen@gmail.com> | 2015-03-30 16:17:11 -0700 |
|---|---|---|
| committer | Matthew Treinish <mtreinish@kortar.org> | 2015-03-31 10:53:54 -0400 |
| commit | 4807004e577ec7ed8250b9c2b20db691c36ed3af (patch) | |
| tree | f52b798d6903aef933adcf0380ad16bd62b8f952 /tempest | |
| parent | 584ea2de116cda5f956ffaa7bffb88ab5ea325cf (diff) | |
| download | tempest-4807004e577ec7ed8250b9c2b20db691c36ed3af.tar.gz | |
test_accounts_file can be None
This patch fixes a TypeError from being raised in the case when
test_accounts_file is None.
Closes-Bug: #1438737
Change-Id: Ib4964f29dbba21e40078234353eaeef19a29e6e6
Diffstat (limited to 'tempest')
| -rw-r--r-- | tempest/common/accounts.py | 3 | ||||
| -rw-r--r-- | tempest/common/credentials.py | 6 | ||||
| -rw-r--r-- | tempest/tests/common/test_accounts.py | 2 | ||||
| -rw-r--r-- | tempest/tests/common/test_admin_available.py | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/tempest/common/accounts.py b/tempest/common/accounts.py index fc8e6a573..6d376d628 100644 --- a/tempest/common/accounts.py +++ b/tempest/common/accounts.py @@ -38,7 +38,8 @@ class Accounts(cred_provider.CredentialProvider): def __init__(self, identity_version=None, name=None): super(Accounts, self).__init__(identity_version=identity_version, name=name) - if os.path.isfile(CONF.auth.test_accounts_file): + if (CONF.auth.test_accounts_file and + os.path.isfile(CONF.auth.test_accounts_file)): accounts = read_accounts_yaml(CONF.auth.test_accounts_file) self.use_default_creds = False else: diff --git a/tempest/common/credentials.py b/tempest/common/credentials.py index f3ddab9a1..c34df48ef 100644 --- a/tempest/common/credentials.py +++ b/tempest/common/credentials.py @@ -38,7 +38,8 @@ def get_isolated_credentials(name, network_resources=None, network_resources=network_resources, identity_version=identity_version) else: - if os.path.isfile(CONF.auth.test_accounts_file): + if (CONF.auth.test_accounts_file and + os.path.isfile(CONF.auth.test_accounts_file)): # Most params are not relevant for pre-created accounts return accounts.Accounts(name=name, identity_version=identity_version) @@ -56,7 +57,8 @@ def is_admin_available(): if CONF.auth.allow_tenant_isolation: return is_admin # Check whether test accounts file has the admin specified or not - elif os.path.isfile(CONF.auth.test_accounts_file): + elif (CONF.auth.test_accounts_file and + os.path.isfile(CONF.auth.test_accounts_file)): check_accounts = accounts.Accounts(name='check_admin') if not check_accounts.admin_available(): is_admin = False diff --git a/tempest/tests/common/test_accounts.py b/tempest/tests/common/test_accounts.py index 0f8fa9263..6371e494b 100644 --- a/tempest/tests/common/test_accounts.py +++ b/tempest/tests/common/test_accounts.py @@ -67,7 +67,7 @@ class TestAccount(base.TestCase): self.useFixture(mockpatch.Patch( 'tempest.common.accounts.read_accounts_yaml', return_value=self.test_accounts)) - cfg.CONF.set_default('test_accounts_file', '', group='auth') + cfg.CONF.set_default('test_accounts_file', 'fake_path', group='auth') self.useFixture(mockpatch.Patch('os.path.isfile', return_value=True)) def _get_hash_list(self, accounts_list): diff --git a/tempest/tests/common/test_admin_available.py b/tempest/tests/common/test_admin_available.py index 5070f22b7..4e3aa4caa 100644 --- a/tempest/tests/common/test_admin_available.py +++ b/tempest/tests/common/test_admin_available.py @@ -52,6 +52,8 @@ class TestAdminAvailable(base.TestCase): self.useFixture(mockpatch.Patch( 'tempest.common.accounts.read_accounts_yaml', return_value=accounts)) + cfg.CONF.set_default('test_accounts_file', + use_accounts_file, group='auth') self.useFixture(mockpatch.Patch('os.path.isfile', return_value=True)) else: |