Delete files remaining during the test

Author: alzhang

tests/test_multipart.py

@@ -50,6 +50,7 @@ def test_upload_part_content_md5_bad(self):
         headers = {'Content-Md5': oss2.utils.content_md5(content + content)}
 
         self.assertRaises(oss2.exceptions.InvalidDigest, self.bucket.upload_part, key, upload_id, 1, content, headers=headers)
+        self.bucket.abort_multipart_upload(key, upload_id)
 
     def test_progress(self):
         stats = {'previous': -1}

tests/test_object.py

@@ -557,6 +557,7 @@ def test_copy_object_source_with_escape(self):
 
         result = self.bucket.get_object(target_key)
         self.assertEqual(content, result.read())
+        self.bucket.delete_object(source_key)
 
     def test_update_object_meta(self):
         key = self.random_key('.txt')

tests/test_select_csv_object.py

@@ -42,6 +42,7 @@ def test_select_csv_object(self, testCase, sql, line_range = None):
         if line_range is None:
             testCase.assertEqual(self.scannedSize, file_size)
 
+        self.bucket.delete_object(key)
         return content
 
     def test_select_csv_object_invalid_request(self, testCase, sql, line_range = None):
@@ -60,6 +61,8 @@ def test_select_csv_object_invalid_request(self, testCase, sql, line_range = Non
             testCase.assertEqual(result.status, 400)
         except oss2.exceptions.ServerError as e:
             testCase.assertEqual(e.status, 400)
+        
+        self.bucket.delete_object(key)
 
 class TestSelectCsvObject(OssTestCase):
     def test_select_csv_object_not_empty_city(self):
@@ -244,6 +247,7 @@ def test_select_csv_object_with_invalid_data(self):
             self.assertFalse(True, "expect to raise exception")
         except SelectOperationFailed:
             print("Got the exception. Ok.")
+        self.bucket.delete_object(key)
 
     def test_select_csv_object_into_file(self):
         key = "city_sample_data.csv"
@@ -276,6 +280,7 @@ def test_select_csv_object_into_file(self):
 
         os.remove(output_file)
         self.assertEqual(content1, content2)
+        self.bucket.delete_object(key)
 
     def test_select_gzip_csv_object_into_file(self):
         key = "city_sample_data.csv.gz"
@@ -300,6 +305,7 @@ def test_select_gzip_csv_object_into_file(self):
 
         os.remove(output_file)
         self.assertEqual(content1, content2)
+        self.bucket.delete_object(key)
 
     def test_select_csv_object_none_range(self):
         key = "city_sample_data.csv"
@@ -319,7 +325,10 @@ def test_select_csv_object_none_range(self):
             for chunk in result:
                 content += chunk
 
+            if len(content) <= 0 :
+                self.bucket.delete_object(key)
             self.assertTrue(len(content) > 0)
+        self.bucket.delete_object(key)
 
     def test_select_csv_object_with_output_delimiters(self):
         key = "test_select_csv_object_with_output_delimiters"
@@ -332,6 +341,7 @@ def test_select_csv_object_with_output_delimiters(self):
             content += chunk
 
         self.assertEqual(content, 'abc|def\r\n'.encode('utf-8'))
+        self.bucket.delete_object(key)
 
     def test_select_csv_object_with_crc(self):
         key = "test_select_csv_object_with_crc"
@@ -344,6 +354,7 @@ def test_select_csv_object_with_crc(self):
             content += chunk
 
         self.assertEqual(content, 'abc,def\n'.encode('utf-8'))
+        self.bucket.delete_object(key)
 
     def test_select_csv_object_with_skip_partial_data(self):
         key = "test_select_csv_object_with_skip_partial_data"
@@ -359,6 +370,7 @@ def test_select_csv_object_with_skip_partial_data(self):
             print("expected error occurs")
 
         self.assertEqual(content, 'abc,def\n'.encode('utf-8'))
+        self.bucket.delete_object(key)
 
     def test_select_csv_object_with_output_raw(self):
         key = "test_select_csv_object_with_output_raw"
@@ -371,6 +383,7 @@ def test_select_csv_object_with_output_raw(self):
             content += chunk
 
         self.assertEqual(content, 'abc\n'.encode('utf-8'))
+        self.bucket.delete_object(key)
 
     def test_select_csv_object_with_keep_columns(self):
         key = "test_select_csv_object_with_keep_columns"
@@ -383,6 +396,7 @@ def test_select_csv_object_with_keep_columns(self):
             content += chunk
 
         self.assertEqual(content, 'abc,\n'.encode('utf-8'))
+        self.bucket.delete_object(key)
 
     def test_select_csv_object_with_output_header(self):
         key = "test_select_csv_object_with_output_header"
@@ -395,6 +409,7 @@ def test_select_csv_object_with_output_header(self):
             content += chunk
 
         self.assertEqual(content, 'name\nabc\n'.encode('utf-8'))
+        self.bucket.delete_object(key)
 
     def test_select_csv_object_with_invalid_parameters(self):
         key = "test_select_csv_object_with_invalid_parameters"
@@ -403,8 +418,14 @@ def test_select_csv_object_with_invalid_parameters(self):
         select_params = {'OutputHeader123':'true', 'CsvHeaderInfo':'Use'}
         try:
             result = self.bucket.select_object(key, "select name from ossobject", None, select_params)
-            self.assertFalse()
+            content = b''
+            for chunk in result:
+                content += chunk
+            
+            self.bucket.delete_object(key)
+            self.assertEqual(content, 'abc\n'.encode('utf-8'))
         except SelectOperationClientError:
+            self.bucket.delete_object(key)
             print("expected error")
 
 if __name__ == '__main__':

tests/test_upload.py

@@ -178,6 +178,10 @@ def upload_part(self, key, upload_id, part_number, data):
         oss2.resumable_upload(self.bucket, key, pathname, multipart_threshold=0, part_size=100 * 1024)
 
         self.assertEqual(len(list(oss2.ObjectUploadIterator(self.bucket, key))), expected_unfinished)
+        upload = self.bucket.list_multipart_uploads()
+        for upload_id in upload.upload_list :
+            self.bucket.abort_multipart_upload(key, upload_id.upload_id)
+        self.bucket.delete_object(key)
 
     def test_interrupt_empty(self):
         self.__test_interrupt(310 * 1024, 1)