Update checked in version of gsutil to version 4.6

third_party/boto/tests/unit/ec2/test_volume.py

 import mock
 from tests.unit import unittest
 
 from boto.ec2.snapshot import Snapshot
 from boto.ec2.tag import Tag, TagSet
 from boto.ec2.volume import Volume, AttachmentSet, VolumeAttribute
 
 
 class VolumeTests(unittest.TestCase):
     def setUp(self):
@@ skipping 60 matching lines @@
         retval = volume.startElement("attachmentSet", None, None)
         self.assertEqual(retval, volume.attach_data)
 
     @mock.patch("boto.ec2.volume.TaggedEC2Object.startElement")
     def test_startElement_else_returns_None(self, startElement):
         startElement.return_value = None
         volume = Volume()
         retval = volume.startElement("not tagSet or attachmentSet", None, None)
         self.assertEqual(retval, None)
 
-    def check_that_attribute_has_been_set(self, name, value, attribute):
+    def check_that_attribute_has_been_set(self, name, value, attribute, obj_value=None):
         volume = Volume()
         volume.endElement(name, value, None)
-        self.assertEqual(getattr(volume, attribute), value)
+        expected_value = obj_value if obj_value is not None else value
+        self.assertEqual(getattr(volume, attribute), expected_value)
 
     def test_endElement_sets_correct_attributes_with_values(self):
         for arguments in [("volumeId", "some value", "id"),
                           ("createTime", "some time", "create_time"),
                           ("status", "some status", "status"),
                           ("size", 5, "size"),
                           ("snapshotId", 1, "snapshot_id"),
                           ("availabilityZone", "some zone", "zone"),
-                          ("someName", "some value", "someName")]:
-            self.check_that_attribute_has_been_set(arguments[0], arguments[1], arguments[2])
+                          ("someName", "some value", "someName"),
+                          ("encrypted", "true", "encrypted", True)]:
+            self.check_that_attribute_has_been_set(*arguments)
 
     def test_endElement_with_name_status_and_empty_string_value_doesnt_set_status(self):
         volume = Volume()
         volume.endElement("status", "", None)
         self.assertNotEqual(volume.status, "")
 
     def test_update_with_result_set_greater_than_0_updates_dict(self):
         self.volume_two.connection.get_all_volumes.return_value = [self.volume_one]
         self.volume_two.update()
 
@@ skipping 152 matching lines @@
         self.volume_attribute.endElement("volumeId", "some_value", None)
         self.assertEqual(self.volume_attribute.id, "some_value")
 
     def test_endElement_with_other_name_sets_other_name_attribute(self):
         self.volume_attribute.endElement("someName", "some value", None)
         self.assertEqual(self.volume_attribute.someName, "some value")
 
 
 if __name__ == "__main__":
     unittest.main()