Mock s3 test

.builder/actions/mock_server_setup.py

@@ -0,0 +1,42 @@
+"""
+Setup local mock server for tests
+"""
+
+import Builder
+
+import os
+import sys
+import subprocess
+import atexit
+
+
+class MockServerSetup(Builder.Action):
+    """
+    Set up this machine for running the mock server test
+
+    This action should be run in the 'pre_build_steps' or 'build_steps' stage.
+    """
+
+    def run(self, env):
+        self.env = env
+        python_path = sys.executable
+        # install dependency for mock server
+        self.env.shell.exec(python_path,
+                            '-m', 'pip', 'install', 'h11', 'trio', check=True)
+        # check the deps can be import correctly
+        self.env.shell.exec(python_path,
+                            '-c', 'import h11, trio', check=True)
+
+        # set cmake flag so mock server tests are enabled
+        env.project.config['cmake_args'].append(
+            '-DENABLE_MOCK_SERVER_TESTS=ON')
+
+        base_dir = os.path.dirname(os.path.realpath(__file__))
+        dir = os.path.join(base_dir, "..", "..", "tests", "mock_s3_server")
+        os.chdir(dir)
+
+        p = subprocess.Popen([python_path, "mock_s3_server.py"])
+
+        @atexit.register
+        def close_mock_server():
+            p.terminate()

CMakeLists.txt

@@ -7,6 +7,8 @@ if (POLICY CMP0069)
 endif()
 
 option(ASSERT_LOCK_HELD "Enable ASSERT_SYNCED_DATA_LOCK_HELD for checking thread issue" OFF)
+option(ENABLE_MOCK_SERVER_TESTS "Whether to run the integration tests that rely on pre-configured mock server" OFF)
+
 if (ASSERT_LOCK_HELD)
     add_definitions(-DASSERT_LOCK_HELD)
 endif()

builder.json

@@ -16,5 +16,6 @@
     ],
     "test_steps": [
         "test"
-    ]
+    ],
+    "pre_build_steps": ["mock-server-setup"]
 }

source/s3_meta_request.c

@@ -319,7 +319,9 @@ void aws_s3_meta_request_set_fail_synced(
 
     meta_request->synced_data.finish_result_set = true;
 
-    if (error_code == AWS_ERROR_S3_INVALID_RESPONSE_STATUS && failed_request != NULL) {
+    if ((error_code == AWS_ERROR_S3_INVALID_RESPONSE_STATUS ||
+         error_code == AWS_ERROR_S3_NON_RECOVERABLE_ASYNC_ERROR) &&
+        failed_request != NULL) {
         aws_s3_meta_request_result_setup(
             meta_request,
             &meta_request->synced_data.finish_result,

tests/CMakeLists.txt

@@ -216,5 +216,12 @@ add_test_case(test_s3_list_bucket_init_mem_safety)
 add_test_case(test_s3_list_bucket_init_mem_safety_optional_copies)
 add_net_test_case(test_s3_list_bucket_valid)
 
+# Tests against local mock server
+if (ENABLE_MOCK_SERVER_TESTS)
+    add_net_test_case(multipart_upload_mock_server)
+    add_net_test_case(async_internal_error_from_complete_multipart_mock_server)
+    add_net_test_case(async_access_denied_from_complete_multipart_mock_server)
+endif()
+
 set(TEST_BINARY_NAME ${PROJECT_NAME}-tests)
 generate_test_driver(${TEST_BINARY_NAME})

tests/mock_s3_server/AbortMultipartUpload/default.json

@@ -0,0 +1,6 @@
+{
+  "status": 204,
+  "headers": {"Connection": "keep-alive"},
+  "body": [
+  ]
+}

tests/mock_s3_server/CompleteMultipartUpload/async_access_denied_error.json

@@ -0,0 +1,14 @@
+{
+    "status": 200,
+    "headers": {"Connection": "close"},
+    "body": [
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
+        "",
+        "<Error>",
+         "<Code>AccessDenied</Code>",
+         "<Message>Access denied.</Message>",
+         "<RequestId>656c76696e6727732072657175657374</RequestId>",
+         "<HostId>Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg==</HostId>",
+        "</Error>"
+    ]
+  }

tests/mock_s3_server/CompleteMultipartUpload/async_internal_error.json

@@ -0,0 +1,14 @@
+{
+    "status": 200,
+    "headers": {"Connection": "close"},
+    "body": [
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
+        "",
+        "<Error>",
+         "<Code>InternalError</Code>",
+         "<Message>We encountered an internal error. Please try again.</Message>",
+         "<RequestId>656c76696e6727732072657175657374</RequestId>",
+         "<HostId>Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg==</HostId>",
+        "</Error>"
+    ]
+}

tests/mock_s3_server/CompleteMultipartUpload/default.json

@@ -0,0 +1,13 @@
+{
+  "status": 200,
+  "headers": {"Connection": "close"},
+  "body": [
+    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
+    "<CompleteMultipartUploadResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">",
+    "<Location>http://default.s3.us-west-2.amazonaws.com/default</Location>",
+    "<Bucket>default</Bucket>",
+    "<Key>default</Key>",
+    "<ETag>\"3858f62230ac3c915f300c664312c11f-9\"</ETag>",
+   "</CompleteMultipartUploadResult>"
+  ]
+}

tests/mock_s3_server/CreateMultipartUpload/default.json

@@ -0,0 +1,12 @@
+{
+  "status": 200,
+  "headers": {},
+  "body": [
+    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
+    "<InitiateMultipartUploadResult>",
+    "<Bucket>default</Bucket>",
+    "<Key>default</Key>",
+    "<UploadId>defaultID</UploadId>",
+    "</InitiateMultipartUploadResult>"
+  ]
+}

tests/mock_s3_server/README.md

@@ -0,0 +1,40 @@
+# Mock S3 server
+
+A **NON-TLS** mock S3 server based on [python-hyper/h11](https://github.com/python-hyper/h11) and [trio](http://trio.readthedocs.io/en/latest/index.html). The server code implementation is based on the trio-server example from python-hyper/h11 [here](https://github.com/python-hyper/h11/blob/master/examples/trio-server.py). Only supports very basic mock response for request received.
+
+## How to run the server
+
+Python 3.5+ required.
+
+- Install hyper/h11 and trio python module. `python3 -m pip install h11 trio`
+- Run python. `python3 ./mock_s3_server.py`.
+
+### Supported Operations
+
+- CreateMultipartUpload
+- CompleteMultipartUpload
+- UploadPart
+- AbortMultipartUpload
+
+### Defined response
+
+The server will read from ./{OperationName}/{Key}.json. The json file is formatted as following:
+
+```json
+{
+    "status": 200,
+    "headers": {"Connection": "close"},
+    "body": [
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
+        "",
+        "<Error>",
+         "<Code>InternalError</Code>",
+         "<Message>We encountered an internal error. Please try again.</Message>",
+         "<RequestId>656c76696e6727732072657175657374</RequestId>",
+         "<HostId>Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg==</HostId>",
+        "</Error>"
+    ]
+}
+```
+
+Where you can define the expected response status, header and response body. If the {Key}.json is not found from file system, it will load the `default.json`.

tests/mock_s3_server/UploadPart/default.json

@@ -0,0 +1,6 @@
+{
+  "status": 200,
+  "headers": {"ETag": "b54357faf0632cce46e942fa68356b38", "Connection": "keep-alive"},
+  "body": [
+  ]
+}