@@ -957,59 +957,6 @@ def test_submit_move_adds_delete_source_subscriber(self):
957957 for i , actual_subscriber in enumerate (actual_subscribers ):
958958 self .assertIsInstance (actual_subscriber , ref_subscribers [i ])
959959
960- def test_skip_copy_with_no_overwrite_and_zero_byte_file_exists (self ):
961- self .cli_params ['no_overwrite' ] = True
962- fileinfo = FileInfo (
963- src = self .source_bucket + "/" + self .source_key ,
964- dest = self .bucket + "/" + self .key ,
965- operation_name = 'copy' ,
966- size = 0 ,
967- source_client = mock .Mock (),
968- )
969- fileinfo .source_client .head_object .return_value = {}
970- future = self .transfer_request_submitter .submit (fileinfo )
971- # The transfer should be skipped, so future should be None
972- self .assertIsNone (future )
973- # Result Queue should be empty because it was specified to ignore no-overwrite warnings.
974- self .assertTrue (self .result_queue .empty ())
975- self .assertEqual (len (self .transfer_manager .copy .call_args_list ), 0 )
976-
977- def test_proceed_copy_with_no_overwrite_and_zero_byte_file_does_not_exist (
978- self ,
979- ):
980- self .cli_params ['no_overwrite' ] = True
981- fileinfo = FileInfo (
982- src = self .source_bucket + "/" + self .source_key ,
983- dest = self .bucket + "/" + self .key ,
984- operation_name = 'copy' ,
985- size = 0 ,
986- source_client = mock .Mock (),
987- )
988- fileinfo .source_client .head_object .side_effect = ClientError (
989- {'Error' : {'Code' : '404' , 'Message' : 'Not Found' }},
990- 'HeadObject' ,
991- )
992- future = self .transfer_request_submitter .submit (fileinfo )
993- # The transfer should proceed, so future should be the transfer manager's return value
994- self .assertIs (self .transfer_manager .copy .return_value , future )
995- self .assertEqual (len (self .transfer_manager .copy .call_args_list ), 1 )
996-
997- def test_proceed_copy_with_no_overwrite_for_non_zero_byte_file (self ):
998- self .cli_params ['no_overwrite' ] = True
999- fileinfo = FileInfo (
1000- src = self .source_bucket + "/" + self .source_key ,
1001- dest = self .bucket + "/" + self .key ,
1002- operation_name = 'copy' ,
1003- size = 100 ,
1004- source_client = mock .Mock (),
1005- )
1006- future = self .transfer_request_submitter .submit (fileinfo )
1007- # The transfer should proceed, so future should be the transfer manager's return value
1008- self .assertIs (self .transfer_manager .copy .return_value , future )
1009- self .assertEqual (len (self .transfer_manager .copy .call_args_list ), 1 )
1010- # Head should not be called when no_overwrite is false
1011- fileinfo .source_client .head_object .assert_not_called ()
1012-
1013960 def test_file_exists_without_no_overwrite (self ):
1014961 self .cli_params ['no_overwrite' ] = False
1015962 fileinfo = FileInfo (
0 commit comments