| commit | 5602f72a7c2b2d92cc5268123fe1084017eeea74 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Sat Feb 01 01:40:38 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Sat Feb 01 01:40:38 2014 +0000 |
| tree | 4f462aeede657a057591e84450fa1b2ecb03fbce | |
| parent | ecc98b777ecec0b173da8a39cd7bb35d05b5d7d9 [diff] | |
| parent | 56041dbf9d62aa2120910b2f7917927be3aa3466 [diff] |
Merge "Fix logic for config file env variables"
diff --git a/tempest/config.py b/tempest/config.py index 704556f..66fbed3 100644 --- a/tempest/config.py +++ b/tempest/config.py
@@ -727,9 +727,7 @@ path = os.path.join(conf_dir, conf_file) - if not (os.path.isfile(path) or - 'TEMPEST_CONFIG_DIR' in os.environ or - 'TEMPEST_CONFIG' in os.environ): + if not os.path.isfile(path): path = failsafe_path # only parse the config file if we expect one to exist. This is needed