Skip to content

Commit e8c6236

Browse files
committed
fix testcase.
1 parent b36a927 commit e8c6236

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

tests/integration/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
RAM_ROLE_ARN = os.getenv("OSS_TEST_RAM_ROLE_ARN")
2222
SIGNATURE_VERSION = os.getenv("OSS_TEST_SIGNATURE_VERSION")
2323
USER_ID = os.getenv("OSS_TEST_USER_ID")
24-
RAM_ROLE_NAME = RAM_ROLE_ARN
24+
RAM_ROLE_NAME = RAM_ROLE_ARN[str.find(RAM_ROLE_ARN, ':role/') + 6:]
2525

2626
PAYER_ACCESS_ID = os.getenv("OSS_TEST_PAYER_ACCESS_KEY_ID")
2727
PAYER_ACCESS_KEY = os.getenv("OSS_TEST_PAYER_ACCESS_KEY_SECRET")

tests/integration/test_client.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,14 +2189,12 @@ def test_get_object_to_file(self):
21892189
))
21902190
self.assertEqual(200, result.status_code)
21912191
self.assertEqual('OK', result.status)
2192-
filename = ''
2193-
with tempfile.TemporaryFile('w+b', delete=False) as f:
2194-
filename = f.name
2192+
filename = tempfile.gettempprefix()
21952193

21962194
gresult = self.client.get_object_to_file(oss.GetObjectRequest(
21972195
bucket=self.bucket_name,
21982196
key=key,
2199-
), f.name)
2197+
), filename)
22002198
self.assertEqual(200, gresult.status_code)
22012199
self.assertEqual('OK', gresult.status)
22022200

@@ -2212,9 +2210,8 @@ def test_get_object_to_file_fail(self):
22122210
self.assertEqual(200, result.status_code)
22132211
self.assertEqual('OK', result.status)
22142212

2215-
filename = ''
2216-
with tempfile.TemporaryFile('w+b', delete=False) as f:
2217-
filename = f.name
2213+
filename = tempfile.gettempprefix()
2214+
22182215
try:
22192216
self.invalid_client.get_object_to_file(oss.GetObjectRequest(
22202217
bucket=self.bucket_name,

tests/unit/test_client.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ def _mock_client(request_fn, response_fn, **kwargs):
3939
return client.Client(cfg)
4040

4141
def _get_tempfile() -> str:
42-
filename = ''
43-
with tempfile.TemporaryFile('w+b', delete=False) as f:
44-
filename = f.name
45-
return filename
46-
42+
return tempfile.gettempprefix()
4743

4844
progress_save_n = 0
4945
def _progress_fn(n, _written, total):
@@ -65,7 +61,7 @@ def _read_body(obj: Any) -> bytes:
6561
if isinstance(a, str):
6662
datas.append(a.encode())
6763
if isinstance(a, int):
68-
datas.append(a.to_bytes())
64+
datas.append(a.to_bytes(1, byteorder="little"))
6965
return b''.join(datas)
7066
else:
7167
raise TypeError(f'not supported type {type(obj)}')

0 commit comments

Comments
 (0)