diff options
author | Zuul <zuul@review.opendev.org> | 2023-04-03 19:27:59 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2023-04-03 19:27:59 +0000 |
commit | 91d62b1879bffc8d5667b49c0207bd5a0f182379 (patch) | |
tree | 56a4dbbe424ccc13b25263502d0002b9b42795b5 | |
parent | 3cfe610a696405c924d9f86fd17453675c668eb6 (diff) | |
parent | 052bcadb27d602c2b81ed8ac1a415c54b054a43c (diff) | |
download | swift-91d62b1879bffc8d5667b49c0207bd5a0f182379.tar.gz |
Merge "tests: Skip s3api functional tests when no s3api user configured"
-rw-r--r-- | test/functional/s3api/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/functional/s3api/__init__.py b/test/functional/s3api/__init__.py index 27d5602b0..4993de61d 100644 --- a/test/functional/s3api/__init__.py +++ b/test/functional/s3api/__init__.py @@ -46,6 +46,8 @@ class S3ApiBase(unittest.TestCase): logging.getLogger('boto').setLevel(logging.DEBUG) def setUp(self): + if not tf.config.get('s3_access_key'): + raise SkipTest('no s3api user configured') if 's3api' not in tf.cluster_info: raise SkipTest('s3api middleware is not enabled') if tf.config.get('account'): @@ -83,6 +85,8 @@ class S3ApiBase(unittest.TestCase): class S3ApiBaseBoto3(S3ApiBase): def setUp(self): + if not tf.config.get('s3_access_key'): + raise SkipTest('no s3api user configured') if 's3api' not in tf.cluster_info: raise SkipTest('s3api middleware is not enabled') try: |