Skip to content

Commit f9b05dc

Browse files
alzhangalzhang
authored andcommitted
Delete files remaining during the test
1 parent da698b5 commit f9b05dc

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

tests/test_select_json_object.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def test_select_json_object(self, testCase, sql, input_format):
5252

5353
if 'SplitRange' not in input_format and 'LineRange' not in input_format:
5454
testCase.assertEqual(self.scannedSize, file_size)
55-
55+
self.bucket.delete_object(key)
5656
return content
5757

5858
def test_select_json_object_invalid_request(self, testCase, sql, input_format):
@@ -235,6 +235,7 @@ def test_select_json_object_with_invalid_data(self):
235235
self.assertFalse(True, "expect to raise exception")
236236
except oss2.exceptions.ServerError:
237237
print("Got the exception. Ok.")
238+
self.bucket.delete_object(key)
238239

239240
def test_select_json_object_none_range(self):
240241
print("test_select_json_object_none_range")
@@ -258,6 +259,7 @@ def test_select_json_object_none_range(self):
258259
content += chunk
259260

260261
self.assertTrue(len(content) > 0)
262+
self.bucket.delete_object(key)
261263

262264
def test_select_json_object_parse_num_as_string(self):
263265
key = "test_select_json_object_parse_num_as_string"
@@ -267,6 +269,7 @@ def test_select_json_object_parse_num_as_string(self):
267269
for chunk in result:
268270
content += chunk
269271
self.assertEqual(content, b"{\"a\":123456789.123456789}\n")
272+
self.bucket.delete_object(key)
270273

271274
if __name__ == '__main__':
272275
unittest.main()

tests/test_upload.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ def test_concurrency(self):
7676
result = self.bucket.get_object(key)
7777
self.assertEqual(content, result.read())
7878
self.assertEqual(result.headers['x-oss-object-type'], 'Multipart')
79+
self.bucket.delete_object(key)
7980

8081
def test_progress(self):
8182
stats = {'previous': -1, 'ncalled': 0}
@@ -180,7 +181,8 @@ def upload_part(self, key, upload_id, part_number, data):
180181
self.assertEqual(len(list(oss2.ObjectUploadIterator(self.bucket, key))), expected_unfinished)
181182
upload = self.bucket.list_multipart_uploads()
182183
for upload_id in upload.upload_list :
183-
self.bucket.abort_multipart_upload(key, upload_id.upload_id)
184+
if key == upload_id.key:
185+
self.bucket.abort_multipart_upload(key, upload_id.upload_id)
184186
self.bucket.delete_object(key)
185187

186188
def test_interrupt_empty(self):

0 commit comments

Comments
 (0)