diff options
| author | karen chan <karen@karen-chan.com> | 2017-01-27 07:43:37 -0800 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2020-01-28 14:00:08 -0800 |
| commit | 6097660f0c350e12c026d62fd2fbd437140b917b (patch) | |
| tree | 0baed55951aba4d410fa408432a0bd204a76b917 /test/functional/__init__.py | |
| parent | 2759d5d51c5e3c684081e066f9efeb495c141524 (diff) | |
| download | swift-6097660f0c350e12c026d62fd2fbd437140b917b.tar.gz | |
s3api: Implement object versioning API
Translate AWS S3 Object Versioning API requests to native Swift Object
Versioning API, speficially:
* bucket versioning status
* bucket versioned objects listing params
* object GETorHEAD & DELETE versionId
* multi_delete versionId
Change-Id: I8296681b61996e073b3ba12ad46f99042dc15c37
Co-Authored-By: Tim Burke <tim.burke@gmail.com>
Co-Authored-By: Clay Gerrard <clay.gerrard@gmail.com>
Diffstat (limited to 'test/functional/__init__.py')
| -rw-r--r-- | test/functional/__init__.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/functional/__init__.py b/test/functional/__init__.py index 660f73078..4dda5f50d 100644 --- a/test/functional/__init__.py +++ b/test/functional/__init__.py @@ -741,7 +741,7 @@ def get_cluster_info(): conn = Connection(config) conn.authenticate() cluster_info.update(conn.cluster_info()) - except (ResponseError, socket.error): + except (ResponseError, socket.error, SkipTest): # Failed to get cluster_information via /info API, so fall back on # test.conf data pass @@ -1039,10 +1039,13 @@ def teardown_package(): global config if config: - conn = Connection(config) - conn.authenticate() - account = Account(conn, config.get('account', config['username'])) - account.delete_containers() + try: + conn = Connection(config) + conn.authenticate() + account = Account(conn, config.get('account', config['username'])) + account.delete_containers() + except (SkipTest): + pass global in_process global _test_socks |