update test code.

Author: huiguangjun

tests/integration/test_access_point_public_access_block_client.py

@@ -111,14 +111,16 @@ def test_access_point_public_access_block(self):
 
                         if ap.status == 'enable':
                             print(f"ap name: {ap.access_point_name}, status: {ap.status}")
-                            del_result = self.client.delete_access_point(oss.DeleteAccessPointRequest(
-                                bucket=bucket_name,
-                                access_point_name=ap.access_point_name,
-                            ))
-                            self.assertEqual(del_result.status_code, 204)
-                            print(f"delete_access_point: {ap.access_point_name}")
-
-
+                            try:
+                                """"""
+                                del_result = self.client.delete_access_point(oss.DeleteAccessPointRequest(
+                                    bucket=bucket_name,
+                                    access_point_name=ap.access_point_name,
+                                ))
+                                self.assertEqual(del_result.status_code, 204)
+                                print(f"delete_access_point: {ap.access_point_name}")
+                            except:
+                                """pass"""
                 num += 1
                 time.sleep(10)
 
@@ -225,14 +227,17 @@ def test_access_point_public_access_block_v1(self):
                     if ap.access_point_name.startswith('ap-test-oss-'):
 
                         if ap.status == 'enable':
-                            print(f"ap name: {ap.access_point_name}, status: {ap.status}")
-                            del_result = self.signv1_client.delete_access_point(oss.DeleteAccessPointRequest(
-                                bucket=bucket_name,
-                                access_point_name=ap.access_point_name,
-                            ))
-                            self.assertEqual(del_result.status_code, 204)
-                            print(f"delete_access_point: {ap.access_point_name}")
-
+                            try:
+                                """"""
+                                print(f"ap name: {ap.access_point_name}, status: {ap.status}")
+                                del_result = self.signv1_client.delete_access_point(oss.DeleteAccessPointRequest(
+                                    bucket=bucket_name,
+                                    access_point_name=ap.access_point_name,
+                                ))
+                                self.assertEqual(del_result.status_code, 204)
+                                print(f"delete_access_point: {ap.access_point_name}")
+                            except:
+                                """pass"""
                 num += 1
                 time.sleep(10)
 

tests/unit/__init__.py

@@ -41,6 +41,11 @@ def reason(self) -> str:
 
     @property
     def content(self) -> bytes:
+        if self._body is not None:
+            if not isinstance(self._body, (bytes, str)):
+                raise TypeError(f"not support type {type(self._body)}")
+            if isinstance(self._body, str):
+                return self._body.encode()
         return self._body
 
     def __repr__(self) -> str:

tests/unit/models/test_bucket_policy.py

@@ -137,7 +137,7 @@ def test_deserialize_result(self):
             status_code=200,
             http_response=MockHttpResponse()
         )
-        deserializer = [serde.deserialize_output_xmlbody]
+        deserializer = []
         serde.deserialize_output(result, op_output, custom_deserializer=deserializer)
         self.assertEqual('OK', result.status)
         self.assertEqual(xml_data, result.body)

tests/unit/models/test_bucket_style.py

@@ -231,7 +231,7 @@ def test_constructor_result(self):
         self.assertEqual('Wed, 20 May 2020 12:07:15 GMT', result.style_list.styles[0].create_time)
         self.assertEqual('Wed, 21 May 2020 12:07:15 GMT', result.style_list.styles[0].last_modify_time)
         self.assertEqual('image', result.style_list.styles[0].category)
-        self.assertEqual('example-bucket', result.style_list.styles[1].name)
+        self.assertEqual('example-bucket2', result.style_list.styles[1].name)
         self.assertEqual('image/resize,w_200', result.style_list.styles[1].content)
         self.assertEqual('Wed, 20 May 2020 12:08:04 GMT', result.style_list.styles[1].create_time)
         self.assertEqual('Wed, 21 May 2020 12:08:04 GMT', result.style_list.styles[1].last_modify_time)