Tests except for issues with cleanup

Author: meyertst-aws

python/example_code/s3/s3_basics/test/test_s3_express_getting_started.py

@@ -44,6 +44,20 @@
 for i in range(len(stop_on_index), len(stop_on_index) + number_of_uploads):
     stop_on_index.append((f"TESTERROR-stub_get_object_regular", i))
 
+current_stop_on_index_length = len(stop_on_index)
+stop_on_index.extend([
+    ("TESTERROR-stub_put_object_other_object", current_stop_on_index_length),
+    ("TESTERROR-stub_put_object_other_object", current_stop_on_index_length + 1),
+    ("TESTERROR-stub_put_object_alt_object", current_stop_on_index_length + 2),
+    ("TESTERROR-stub_put_object_alt_object", current_stop_on_index_length + 3),
+    ("TESTERROR-stub_put_object_other_alt_object", current_stop_on_index_length + 4),
+    ("TESTERROR-stub_put_object_other_alt_object", current_stop_on_index_length + 5),
+    ("TESTERROR-stub_list_objects_directory", current_stop_on_index_length + 6),
+    ("TESTERROR-stub_list_objects_regular", current_stop_on_index_length + 7),
+    ("TESTERROR-stub_list_objects_directory", current_stop_on_index_length + 8),
+    ("TESTERROR-stub_delete_objects_directory", current_stop_on_index_length + 9),
+])
+
 @pytest.mark.parametrize(
     "error_code, stop_on_index",
     stop_on_index,
@@ -98,12 +112,19 @@ def test_s3_express_scenario(
                           }
 
     object_name = "basic-text-object"
+    other_object = f"other/{object_name}"
+    alt_object = f"alt/{object_name}"
+    other_alt_object = f"other/alt/{object_name}"
+
+    object_keys = [object_name, other_object, alt_object, other_alt_object]
+
     inputs = [
         "y",
         bucket_name_prefix,
         "1",
         "y",
-        number_of_uploads
+        number_of_uploads,
+        "y"
     ]
     monkeypatch.setattr("builtins.input", lambda x: inputs.pop(0))
 
@@ -131,6 +152,20 @@ def test_s3_express_scenario(
         for _ in range(number_of_uploads):
             runner.add(s3_stubber.stub_get_object, regular_bucket_name, object_name)
 
+        runner.add (s3_stubber.stub_put_object, regular_bucket_name, other_object, "")
+        runner.add (s3_stubber.stub_put_object, directory_bucket_name, other_object, "")
+        runner.add (s3_stubber.stub_put_object, regular_bucket_name, alt_object, "")
+        runner.add (s3_stubber.stub_put_object, directory_bucket_name, alt_object, "")
+        runner.add (s3_stubber.stub_put_object, regular_bucket_name, other_alt_object, "")
+        runner.add (s3_stubber.stub_put_object, directory_bucket_name, other_alt_object, "")
+
+        runner.add(s3_stubber.stub_list_objects_v2, directory_bucket_name, object_keys)
+        runner.add(s3_stubber.stub_list_objects_v2, regular_bucket_name, object_keys)
+
+        runner.add(s3_stubber.stub_list_objects_v2, directory_bucket_name, object_keys)
+        runner.add(s3_stubber.stub_delete_objects, directory_bucket_name, object_keys)
+
+
     def mock_wait(self, **kwargs):
         return
 

python/test_tools/s3_stubber.py

@@ -325,6 +325,26 @@ def stub_list_objects(
             "list_objects", expected_params, response, error_code=error_code
         )
 
+    def stub_list_objects_v2(
+        self,
+        bucket_name,
+        object_keys=None,
+        prefix=None,
+        delimiter=None,
+        error_code=None,
+    ):
+        if not object_keys:
+            object_keys = []
+        expected_params = {"Bucket": bucket_name}
+        if prefix is not None:
+            expected_params["Prefix"] = prefix
+        if delimiter is not None:
+            expected_params["Delimiter"] = delimiter
+        response = {"Contents": [{"Key": key} for key in object_keys]}
+        self._stub_bifurcator(
+            "list_objects_v2", expected_params, response, error_code=error_code
+        )
+
     def stub_delete_objects(self, bucket_name, object_keys, error_code=None):
         expected_params = {
             "Bucket": bucket_name,