Update functional s3 tests

Author: hssyoo

tests/functional/s3/__init__.py

@@ -70,14 +70,23 @@ def assert_in_operations_called(self, expected_operation_with_params):
         )
 
     def head_object_response(self, **override_kwargs):
-        response = {'ContentLength': 100, 'LastModified': '00:00:00Z'}
+        response = {
+            'ContentLength': 100,
+            'LastModified': '00:00:00Z',
+            'ETag': '"foo-1"',
+        }
         response.update(override_kwargs)
         return response
 
     def list_objects_response(self, keys, **override_kwargs):
         contents = []
         for key in keys:
-            content = {'Key': key, 'LastModified': '00:00:00Z', 'Size': 100}
+            content = {
+                'Key': key,
+                'LastModified': '00:00:00Z',
+                'Size': 100,
+                'ETag': '"foo-1"',
+            }
             if override_kwargs:
                 content.update(override_kwargs)
             contents.append(content)

tests/functional/s3/test_cp_command.py

@@ -261,7 +261,11 @@ def test_upload_deep_archive(self):
 
     def test_operations_used_in_download_file(self):
         self.parsed_responses = [
-            {"ContentLength": "100", "LastModified": "00:00:00Z"},
+            {
+                "ContentLength": "100",
+                "LastModified": "00:00:00Z",
+                'ETag': '"foo-1"',
+            },
             {'ETag': '"foo-1"', 'Body': BytesIO(b'foo')},
         ]
         cmdline = '%s s3://bucket/key.txt %s' % (
@@ -468,7 +472,11 @@ def test_cp_fails_with_utime_errors_but_continues(self):
         full_path = self.files.create_file('foo.txt', '')
         cmdline = '%s s3://bucket/key.txt %s' % (self.prefix, full_path)
         self.parsed_responses = [
-            {"ContentLength": "100", "LastModified": "00:00:00Z"},
+            {
+                "ContentLength": "100",
+                "LastModified": "00:00:00Z",
+                "ETag": '"foo-1"',
+            },
             {'ETag': '"foo-1"', 'Body': BytesIO(b'foo')},
         ]
         with mock.patch('os.utime') as mock_utime:
@@ -486,6 +494,7 @@ def test_recursive_glacier_download_with_force_glacier(self):
                         'LastModified': '00:00:00Z',
                         'StorageClass': 'GLACIER',
                         'Size': 100,
+                        'ETag': '"foo-1"',
                     },
                 ],
                 'CommonPrefixes': [],
@@ -1326,12 +1335,14 @@ def test_ranged_download(self):
                     'mykey',
                     Range=mock.ANY,
                     RequestPayer='requester',
+                    IfMatch='"foo-1"',
                 ),
                 self.get_object_request(
                     'mybucket',
                     'mykey',
                     Range=mock.ANY,
                     RequestPayer='requester',
+                    IfMatch='"foo-1"',
                 ),
             ]
         )

tests/functional/s3/test_mv_command.py

@@ -124,7 +124,11 @@ def test_download_move_with_request_payer(self):
 
         self.parsed_responses = [
             # Response for HeadObject
-            {"ContentLength": 100, "LastModified": "00:00:00Z"},
+            {
+                "ContentLength": 100,
+                "LastModified": "00:00:00Z",
+                "ETag": '"foo-1"',
+            },
             # Response for GetObject
             {'ETag': '"foo-1"', 'Body': BytesIO(b'foo')},
             # Response for DeleteObject

tests/functional/s3/test_sync_command.py

@@ -77,6 +77,7 @@ def test_sync_to_non_existant_directory(self):
                         "Key": key,
                         "Size": 3,
                         "LastModified": "2014-01-09T20:45:49.000Z",
+                        "ETag": '"c8afdb36c52cf4727836669019e69222-"',
                     }
                 ],
             },
@@ -125,6 +126,7 @@ def test_glacier_sync_with_force_glacier(self):
                         'LastModified': '00:00:00Z',
                         'StorageClass': 'GLACIER',
                         'Size': 100,
+                        'ETag': '"foo-1"',
                     },
                 ],
                 'CommonPrefixes': [],