Don't skip account acl functional tests

The functional tests covering account acls are skipped
if keystoneauth is in the pipeline, even if keystone auth
is not being used. Devstack configures the pipeline to have
both tempauth and keystoneauth, so these tests are always
skipped.

This patch changes the condition for skipping account acl
to be based on tempauth being the auth service configured
for the tests.

Change-Id: I378ec6aa0ba52d37a33796057e59a9ebfcab2574

test/functional/__init__.py

@@ -666,13 +666,13 @@ def requires_acls(f):
     def wrapper(*args, **kwargs):
         global skip, cluster_info
         if skip or not cluster_info:
-            raise SkipTest
+            raise SkipTest('Requires account ACLs')
         # Determine whether this cluster has account ACLs; if not, skip test
         if not cluster_info.get('tempauth', {}).get('account_acls'):
-            raise SkipTest
-        if 'keystoneauth' in cluster_info:
+            raise SkipTest('Requires account ACLs')
+        if swift_test_auth_version != '1':
             # remove when keystoneauth supports account acls
-            raise SkipTest
+            raise SkipTest('Requires account ACLs')
         reset_acl()
         try:
             rv = f(*args, **kwargs)