commit e4953ac129dc0f1fd072c9976b178137ad46c34c
author Jenkins <jenkins@review.openstack.org> Fri Mar 13 02:53:47 2015 +0000
committer Gerrit Code Review <review@openstack.org> Fri Mar 13 02:53:48 2015 +0000
tree 52bba3f2626711be5716efbaf058a87132e4b6bc
parent 05415cca7db86d5cef547e8e135286870a18dc78
parent 046953c24b77747850b1c142df2c52d1ff3dd21e

Merge "Skip boto tests when auth_version is v3"

tempest/thirdparty/boto/test.py

diff --git a/tempest/thirdparty/boto/test.py b/tempest/thirdparty/boto/test.py
index 043b230..90d0838 100644
--- a/tempest/thirdparty/boto/test.py
+++ b/tempest/thirdparty/boto/test.py
@@ -203,6 +203,9 @@
         super(BotoTestCase, cls).skip_checks()
         if not CONF.compute_feature_enabled.ec2_api:
             raise cls.skipException("The EC2 API is not available")
+        if not CONF.identity_feature_enabled.api_v2 or \
+                not CONF.identity.auth_version == 'v2':
+            raise cls.skipException("Identity v2 is not available")
 
     @classmethod
     def setup_credentials(cls):