optimize ut

aliyun · Nov 9, 2017 · 7deda66 · 7deda66
1 parent e363332
commit 7deda66
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/oss2/xml_utils.py b/oss2/xml_utils.py
@@ -394,9 +394,6 @@ def parse_lifecycle_abort_multipart_upload(abort_multipart_upload_node):
 
 
 def parse_lifecycle_storage_transitions(storage_transition_nodes):
-    if storage_transition_nodes is None:
-        return None
-
     storage_transitions = []
     for storage_transition_node in storage_transition_nodes:
         storage_class = _find_tag(storage_transition_node, 'StorageClass')

diff --git a/tests/test_bucket.py b/tests/test_bucket.py
@@ -209,6 +209,7 @@ def test_lifecycle_abort_multipart_upload_days(self):
         rule = LifecycleRule(random_string(10), '中文前缀/',
                              status=LifecycleRule.DISABLED,
                              expiration=LifecycleExpiration(created_before_date=datetime.date(2100, 12, 25)))
+
         rule.abort_multipart_upload = AbortMultipartUpload(days=356)
 
         lifecycle = BucketLifecycle([rule])
@@ -313,6 +314,16 @@ def test_lifecycle_all(self):
         rule = LifecycleRule(random_string(10), '中文前缀/',
                              status=LifecycleRule.DISABLED,
                              expiration=LifecycleExpiration(days=357))
+
+        self.assertRaises(oss2.exceptions.ClientError,
+                          LifecycleExpiration, days=356, created_before_date=datetime.date(2100, 12, 25))
+
+        self.assertRaises(oss2.exceptions.ClientError,
+                          AbortMultipartUpload, days=356, created_before_date=datetime.date(2100, 12, 25))
+
+        self.assertRaises(oss2.exceptions.ClientError,
+                          StorageTransition, days=356, created_before_date=datetime.date(2100, 12, 25))
+
         rule.abort_multipart_upload = AbortMultipartUpload(days=356)
         rule.storage_transitions = [StorageTransition(days=356, storage_class=oss2.BUCKET_STORAGE_CLASS_IA)]