Update checked in version of gsutil to version 4.6

third_party/boto/tests/integration/s3/test_bucket.py

 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2011 Mitch Garnaat http://garnaat.org/
 # All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
@@ skipping 16 matching lines @@
 """
 
 import unittest
 import time
 
 from boto.exception import S3ResponseError
 from boto.s3.connection import S3Connection
 from boto.s3.bucketlogging import BucketLogging
 from boto.s3.lifecycle import Lifecycle
 from boto.s3.lifecycle import Transition
+from boto.s3.lifecycle import Expiration
 from boto.s3.lifecycle import Rule
 from boto.s3.acl import Grant
 from boto.s3.tagging import Tags, TagSet
-from boto.s3.lifecycle import Lifecycle, Expiration, Transition
 from boto.s3.website import RedirectLocation
 
 
 class S3BucketTest (unittest.TestCase):
     s3 = True
 
     def setUp(self):
         self.conn = S3Connection()
         self.bucket_name = 'bucket-%d' % int(time.time())
         self.bucket = self.conn.create_bucket(self.bucket_name)
@@ skipping 203 matching lines @@
         lifecycle.add_rule(name, prefix, "Enabled", days)
         # set the lifecycle
         self.bucket.configure_lifecycle(lifecycle)
         # read the lifecycle back
         readlifecycle = self.bucket.get_lifecycle_config();
         for rule in readlifecycle:
             self.assertEqual(rule.id, name)
             self.assertEqual(rule.expiration.days, days)
             #Note: Boto seems correct? AWS seems broken?
             #self.assertEqual(rule.prefix, prefix)
+
+    def test_lifecycle_with_defaults(self):
+        lifecycle = Lifecycle()
+        lifecycle.add_rule(expiration=30)
+        self.assertTrue(self.bucket.configure_lifecycle(lifecycle))
+        response = self.bucket.get_lifecycle_config()
+        self.assertEqual(len(response), 1)
+        actual_lifecycle = response[0]
+        self.assertNotEqual(len(actual_lifecycle.id), 0)
+        self.assertEqual(actual_lifecycle.prefix, '')
+
+    def test_lifecycle_rule_xml(self):
+        # create a rule directly with id, prefix defaults
+        rule = Rule(status='Enabled', expiration=30)
+        s = rule.to_xml()
+        # Confirm no ID is set in the rule.
+        self.assertEqual(s.find("<ID>"), -1)
+        # Confirm Prefix is '' and not set to 'None'
+        self.assertNotEqual(s.find("<Prefix></Prefix>"), -1)