Update checked in version of gsutil to version 4.6

third_party/boto/tests/unit/glacier/test_layer2.py

 # -*- coding: utf-8 -*-
 # Copyright (c) 2012 Thomas Parslow http://almostobsolete.net/
 #
 # 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
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
@@ skipping 15 matching lines @@
 from mock import call, Mock, patch, sentinel
 
 from boto.glacier.layer1 import Layer1
 from boto.glacier.layer2 import Layer2
 import boto.glacier.vault
 from boto.glacier.vault import Vault
 from boto.glacier.vault import Job
 
 from StringIO import StringIO
 
-from datetime import datetime
+from datetime import datetime, tzinfo, timedelta
 
 # Some fixture data from the Glacier docs
 FIXTURE_VAULT = {
   "CreationDate" : "2012-02-20T17:01:45.198Z",
   "LastInventoryDate" : "2012-03-20T17:03:43.221Z",
   "NumberOfArchives" : 192,
   "SizeInBytes" : 78088912,
   "VaultARN" : "arn:aws:glacier:us-east-1:012345678901:vaults/examplevault",
   "VaultName" : "examplevault"
 }
@@ skipping 157 matching lines @@
             "examplevault", self.vault.DefaultPartSize, "stuff")
         self.assertEqual(writer.vault, self.vault)
         self.assertEqual(writer.upload_id, "UPLOADID")
 
     def test_delete_vault(self):
         self.vault.delete_archive("archive")
         self.mock_layer1.delete_archive.assert_called_with("examplevault",
                                                            "archive")
 
     def test_initiate_job(self):
+        class UTC(tzinfo):
+            """UTC"""
+
+            def utcoffset(self, dt):
+                return timedelta(0)
+
+            def tzname(self, dt):
+                return "Z"
+
+            def dst(self, dt):
+                return timedelta(0)
+
         self.mock_layer1.initiate_job.return_value = {'JobId': 'job-id'}
-        self.vault.retrieve_inventory(start_date=datetime(2014, 01, 01),
-                                      end_date=datetime(2014, 01, 02),
+        self.vault.retrieve_inventory(start_date=datetime(2014, 01, 01, tzinfo=UTC()),
+                                      end_date=datetime(2014, 01, 02, tzinfo=UTC()),
                                       limit=100)
         self.mock_layer1.initiate_job.assert_called_with(
             'examplevault', {
                 'Type': 'inventory-retrieval',
                 'InventoryRetrievalParameters': {
-                    'StartDate': '2014-01-01T00:00:00',
-                    'EndDate': '2014-01-02T00:00:00',
+                    'StartDate': '2014-01-01T00:00:00Z',
+                    'EndDate': '2014-01-02T00:00:00Z',
                     'Limit': 100
                 }
             })
 
     def test_get_job(self):
         self.mock_layer1.describe_job.return_value = FIXTURE_ARCHIVE_JOB
         job = self.vault.get_job(
             "NkbByEejwEggmBz2fTHgJrg0XBoDfjP4q6iu87-TjhqG6eGoOY9Z8i1_AUyUsuhPA"
             "dTqLHy8pTl5nfCFJmDl2yEZONi5L26Omw12vcs01MNGntHEQL8MBfGlqrEXAMPLEA"
             "rchiveId")
@@ skipping 86 matching lines @@
             AssertionError, Vault._range_string_to_part_index, '0-5', 4)
 
     def test_range_start_mismatch(self):
         self.assertRaises(
             AssertionError, Vault._range_string_to_part_index, '1-3', 4)
 
     def test_range_end_mismatch(self):
         # End mismatch is OK, since the last part might be short
         self.assertEquals(
             Vault._range_string_to_part_index('0-2', 4), 0)