Add more tests for s3 200 error responses

tests/unit/test_endpoint.py

@@ -347,9 +347,9 @@ def test_retry_on_socket_errors(self):
         self.assertEqual(self.total_calls, 3)
 
 
-class TestResetStreamOnRetry(unittest.TestCase):
+class TestS3ResetStreamOnRetry(unittest.TestCase):
     def setUp(self):
-        super(TestResetStreamOnRetry, self).setUp()
+        super(TestS3ResetStreamOnRetry, self).setUp()
         self.total_calls = 0
         self.auth = Mock()
         self.session = create_session(include_builtin_handlers=False)
@@ -393,6 +393,42 @@ def test_reset_stream_on_retry(self):
         self.assertEqual(payload.literal_value.total_resets, 2)
 
 
+class TestS3Retry200SpecialCases(unittest.TestCase):
+    def setUp(self):
+        super(TestS3Retry200SpecialCases, self).setUp()
+        self.total_calls = 0
+        self.auth = Mock()
+        self.session = create_session(include_builtin_handlers=True)
+        self.service = Mock()
+        self.service.endpoint_prefix = 's3'
+        self.service.session = self.session
+        self.endpoint = RestEndpoint(
+            self.service, 'us-east-1', 'https://s3.amazonaws.com/',
+            auth=self.auth)
+        self.http_session = Mock()
+        self.endpoint.http_session = self.http_session
+        self.get_response_patch = patch('botocore.response.get_response')
+        self.get_response = self.get_response_patch.start()
+        self.retried_on_exception = None
+
+    def tearDown(self):
+        self.get_response_patch.stop()
+
+    def test_retry_special_case_s3_200_response(self):
+        # Test for:
+        # http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectCOPY.html
+        op = Mock()
+        op.name = 'CopyObject'
+        op.http = {'uri': '', 'method': 'PUT'}
+        http_response = Mock()
+        http_response.status_code = 200
+        parsed = {'Errors': [{'Code': 'InternalError', 'Message': 'foo'}]}
+        self.get_response.return_value = (http_response, parsed)
+        self.endpoint.make_request(op, {'headers': {}, 'payload': None})
+        # The response code should have been switched to 500.
+        self.assertEqual(http_response.status_code, 500)
+
+
 class TestRestEndpoint(unittest.TestCase):
 
     def test_encode_uri_params_unicode(self):

tests/unit/test_handlers.py

@@ -126,5 +126,40 @@ def test_200_response_with_no_error_left_untouched(self):
         self.assertEqual(http_response.status_code, 200)
 
 
+class TestRetryHandlerOrder(BaseSessionTest):
+    def get_handler_names(self, responses):
+        names = []
+        for response in responses:
+            handler = response[0]
+            if hasattr(handler, '__name__'):
+                names.append(handler.__name__)
+            elif hasattr(handler, '__class__'):
+                names.append(handler.__class__.__name__)
+            else:
+                names.append(str(handler))
+        return names
+
+    def test_s3_special_case_is_before_other_retry(self):
+        service = self.session.get_service('s3')
+        operation = service.get_operation('CopyObject')
+        responses = self.session.emit(
+            'needs-retry.s3.CopyObject',
+            response=(mock.Mock(), mock.Mock()), endpoint=mock.Mock(), operation=operation,
+            attempts=1, caught_exception=None)
+        # This is implementation specific, but we're trying to verify that
+        # the check_for_200_error is before any of the retry logic in
+        # botocore.retryhandlers.
+        # Technically, as long as the relative order is preserved, we don't
+        # care about the absolute order.
+        names = self.get_handler_names(responses)
+        self.assertIn('check_for_200_error', names)
+        self.assertIn('RetryHandler', names)
+        s3_200_handler = names.index('check_for_200_error')
+        general_retry_handler = names.index('RetryHandler')
+        self.assertTrue(s3_200_handler < general_retry_handler,
+                        "S3 200 error handler was suppose to be before "
+                        "the general retry handler, but it was not.")
+
+
 if __name__ == '__main__':
     unittest.main()