tests: More simplification of s3api test bucket naming

Change-Id: Ie59f11874daf9f166a699fa904581830942163a9
Related-Change: I02efba463a8263ca44be511c025c6c6bfbc57334
This commit is contained in:
Alistair Coles 2025-02-20 10:38:08 +00:00
parent 8b6abfb85d
commit adc7760ed5
2 changed files with 3 additions and 11 deletions

View File

@ -23,7 +23,7 @@ class BaseMultiPartUploadTestCase(BaseS3TestCase):
def setUp(self):
self.client = self.get_s3_client(1)
self.bucket_name = self.create_name('test-mpu')
self.bucket_name = self.create_name('mpu-bucket')
resp = self.client.create_bucket(Bucket=self.bucket_name)
self.assertEqual(200, resp['ResponseMetadata']['HTTPStatusCode'])
self.num_parts = 3

View File

@ -15,7 +15,7 @@
from unittest import SkipTest
from test.s3api import BaseS3TestCase
from test.s3api import BaseS3TestCaseWithBucket
class AlwaysAbsoluteURLProxyConfig(object):
@ -30,21 +30,13 @@ class AlwaysAbsoluteURLProxyConfig(object):
return {}
class TestRequestTargetStyle(BaseS3TestCase):
class TestRequestTargetStyle(BaseS3TestCaseWithBucket):
def setUp(self):
self.client = self.get_s3_client(1)
if not self.client._endpoint.host.startswith('https:'):
raise SkipTest('Absolute URL test requires https')
self.bucket_name = self.create_name('test-address-style')
resp = self.client.create_bucket(Bucket=self.bucket_name)
self.assertEqual(200, resp['ResponseMetadata']['HTTPStatusCode'])
def tearDown(self):
self.clear_bucket(self.client, self.bucket_name)
super(TestRequestTargetStyle, self).tearDown()
def test_absolute_url(self):
sess = self.client._endpoint.http_session
sess._proxy_config = AlwaysAbsoluteURLProxyConfig()