mirror of
https://github.com/ceph/s3-tests.git
synced 2025-05-14 11:11:20 +00:00
pytest: replace @nose.with_setup with fixtures
Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
parent
4864dbc340
commit
c80e9d2118
3 changed files with 37 additions and 125 deletions
|
@ -6235,30 +6235,34 @@ def test_list_buckets_bad_auth():
|
|||
eq(status, 403)
|
||||
eq(error_code, 'SignatureDoesNotMatch')
|
||||
|
||||
@pytest.fixture
|
||||
def override_prefix_a():
|
||||
nuke_prefixed_buckets(prefix='a'+get_prefix())
|
||||
yield
|
||||
nuke_prefixed_buckets(prefix='a'+get_prefix())
|
||||
|
||||
@attr(resource='bucket')
|
||||
@attr(method='put')
|
||||
@attr(operation='create bucket')
|
||||
@attr(assertion='name starts with alphabetic works')
|
||||
# this test goes outside the user-configure prefix because it needs to
|
||||
# control the initial character of the bucket name
|
||||
@nose.with_setup(
|
||||
setup=lambda: nuke_prefixed_buckets(prefix='a'+get_prefix()),
|
||||
teardown=lambda: nuke_prefixed_buckets(prefix='a'+get_prefix()),
|
||||
)
|
||||
def test_bucket_create_naming_good_starts_alpha():
|
||||
def test_bucket_create_naming_good_starts_alpha(override_prefix_a):
|
||||
check_good_bucket_name('foo', _prefix='a'+get_prefix())
|
||||
|
||||
@pytest.fixture
|
||||
def override_prefix_0():
|
||||
nuke_prefixed_buckets(prefix='0'+get_prefix())
|
||||
yield
|
||||
nuke_prefixed_buckets(prefix='0'+get_prefix())
|
||||
|
||||
@attr(resource='bucket')
|
||||
@attr(method='put')
|
||||
@attr(operation='create bucket')
|
||||
@attr(assertion='name starts with numeric works')
|
||||
# this test goes outside the user-configure prefix because it needs to
|
||||
# control the initial character of the bucket name
|
||||
@nose.with_setup(
|
||||
setup=lambda: nuke_prefixed_buckets(prefix='0'+get_prefix()),
|
||||
teardown=lambda: nuke_prefixed_buckets(prefix='0'+get_prefix()),
|
||||
)
|
||||
def test_bucket_create_naming_good_starts_digit():
|
||||
def test_bucket_create_naming_good_starts_digit(override_prefix_0):
|
||||
check_good_bucket_name('foo', _prefix='0'+get_prefix())
|
||||
|
||||
@attr(resource='bucket')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue