summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-02-25 07:27:09 +0000
committerGerrit Code Review <review@openstack.org>2023-02-25 07:27:09 +0000
commite21766cf6415097a5d8b2ba612baec07e86d5c8e (patch)
tree4398456d481767d8dd28fbe7926cb9577019deca /test
parentcd693e519e71dfc95a0de389293a2df2523a7d70 (diff)
parent8dd2d010ac789a752da60aa72b289e9b275c4863 (diff)
downloadswift-e21766cf6415097a5d8b2ba612baec07e86d5c8e.tar.gz
Merge "Skip S3 versioning test when versioning is not enabled"
Diffstat (limited to 'test')
-rw-r--r--test/functional/s3api/test_xxe_injection.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/functional/s3api/test_xxe_injection.py b/test/functional/s3api/test_xxe_injection.py
index b046fed75..d26c284a8 100644
--- a/test/functional/s3api/test_xxe_injection.py
+++ b/test/functional/s3api/test_xxe_injection.py
@@ -208,6 +208,9 @@ class TestS3ApiXxeInjection(S3ApiBaseBoto3):
self.assertEqual(204, response_metadata.get('HTTPStatusCode'))
def test_put_bucket_versioning(self):
+ if 'object_versioning' not in tf.cluster_info:
+ raise tf.SkipTest('S3 versioning requires that Swift object '
+ 'versioning be enabled')
self._create_bucket()
url = self._presign_url(