Merge branch 'ah/1483-change-sets' into release-candidate-4.5.0

alexharv074 · Jul 6, 2024 · ad6f9b9 · ad6f9b9
2 parents 9509ee2 + 8d6e3f6
commit ad6f9b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/integration-tests/features/describe-change-set.feature b/integration-tests/features/describe-change-set.feature
@@ -10,8 +10,7 @@ Feature: Describe change sets
     Given stack "1/A" exists in "CREATE_COMPLETE" state
     and stack "1/A" has no change sets
     When the user describes change set "A" for stack "1/A"
-    Then a "ClientError" is raised
-    and the user is told "change set does not exist"
+    Then the user is told "Failed describing Change Set"
 
   Scenario: describe a change set that exists with ignore dependencies
     Given stack "1/A" exists in "CREATE_COMPLETE" state

diff --git a/integration-tests/features/execute-change-set.feature b/integration-tests/features/execute-change-set.feature
@@ -11,8 +11,7 @@ Feature: Execute change set
     Given stack "1/A" exists in "CREATE_COMPLETE" state
     And stack "1/A" does not have change set "A"
     When the user executes change set "A" for stack "1/A"
-    Then a "ClientError" is raised
-    And the user is told "change set does not exist"
+    Then the user is told "change set does not exist"
 
   Scenario: execute a change set that exists with ignore dependencies
     Given stack "1/A" exists in "CREATE_COMPLETE" state

diff --git a/integration-tests/steps/helpers.py b/integration-tests/steps/helpers.py
@@ -17,14 +17,15 @@ def step_impl(context, message):
         msg = context.error.response["Error"]["Message"]
         assert msg.endswith("does not exist")
     elif message == "change set does not exist":
-        msg = context.error.response["Error"]["Message"]
-        assert msg.endswith("does not exist")
+        assert context.log_capture.find_event("does not exist")
     elif message == "the template is valid":
         for stack, status in context.response.items():
             assert status["ResponseMetadata"]["HTTPStatusCode"] == 200
     elif message == "the template is malformed":
         msg = context.error.response["Error"]["Message"]
         assert msg.startswith("Template format error")
+    elif message == "Failed describing Change Set":
+        assert context.log_capture.find_event(message)
     else:
         raise Exception("Step has incorrect message")