commit 5c5bda92cd2ab2655253bed20f67cc1dae4ecab8
author Jenkins <jenkins@review.openstack.org> Mon Feb 04 23:51:52 2013 +0000
committer Gerrit Code Review <review@openstack.org> Mon Feb 04 23:51:52 2013 +0000
tree 2e993268e0cf873387e5a535eb7edc688d9f8443
parent 2c820c65874c7b15775c684e6559c4826d2b3d32
parent afd43eb831d542212fb081042ecabf47abbeb9dc

Merge "Fixes "not in" usage"

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index f6fcd90..38f3535 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -404,9 +404,9 @@
 
         path = os.path.join(conf_dir, conf_file)
 
-        if (not os.path.isfile(path) and
-                not 'TEMPEST_CONFIG_DIR' in os.environ and
-                not 'TEMPEST_CONFIG' in os.environ):
+        if not (os.path.isfile(path) or
+                'TEMPEST_CONFIG_DIR' in os.environ or
+                'TEMPEST_CONFIG' in os.environ):
             path = "/etc/tempest/" + self.DEFAULT_CONFIG_FILE
 
         LOG.info("Using tempest config file %s" % path)