Merge pull request #256 from mgoerens/adjust_timeout_message

Adjust expected timeout message and accept regex in expected message
openshift-helm-charts · Sep 18, 2023 · a06a729 · a06a729
2 parents dc057c3 + 55435a3
commit a06a729
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/tests/functional/behave_features/HC-16_chart_test_takes_more_than_30mins.feature b/tests/functional/behave_features/HC-16_chart_test_takes_more_than_30mins.feature
@@ -10,8 +10,8 @@ Feature: Chart test takes longer time and exceeds default timeout
 
     @partners @full
     Examples:
-      | vendor_type  | vendor    | chart_path                                  | message                               |
-      | partners     | hashicorp | tests/data/vault-test-timeout-0.17.0.tgz    | * timed out waiting for the condition |
+      | vendor_type  | vendor    | chart_path                                  | message                                                      |
+      | partners     | hashicorp | tests/data/vault-test-timeout-0.17.0.tgz    | (timeout has expired\|timed out waiting for the condition)  |
 
     @community @full
     Examples:

diff --git a/tests/functional/behave_features/common/utils/chart_certification.py b/tests/functional/behave_features/common/utils/chart_certification.py
@@ -2,6 +2,7 @@
 """Utility class for setting up and manipulating certification workflow tests."""
 
 import os
+import re
 import json
 import pathlib
 import shutil
@@ -910,7 +911,7 @@ def check_pull_request_comments(self, expect_message: str):
             raise AssertionError(f"No comment found in the PR {self.secrets.pr_number}")
         complete_comment = response[0]["body"]
 
-        if expect_message in complete_comment:
+        if re.search(expect_message, complete_comment):
             logging.info("Found the expected comment in the PR")
         else:
             raise AssertionError(

diff --git a/tests/functional/features/HC-16_chart_test_takes_more_than_30mins.feature b/tests/functional/features/HC-16_chart_test_takes_more_than_30mins.feature
@@ -14,7 +14,7 @@ Feature: Chart test takes longer time and exceeds default timeout
 
     Examples:
       | vendor_type  | vendor         | message                                                                                     |
-      | partners     | hashicorp      | * timed out waiting for the condition                                                       |
+      | partners     | hashicorp      | (timeout has expired\|timed out waiting for the condition)                                 |
       | community    | redhat         | Community charts require maintainer review and approval, a review will be conducted shortly |
 
   Scenario Outline: [HC-16-002] A redhat associate submits a chart that takes more than 30 mins

diff --git a/tests/functional/utils/chart_certification.py b/tests/functional/utils/chart_certification.py
@@ -2,6 +2,7 @@
 """Utility class for setting up and manipulating certification workflow tests."""
 
 import os
+import re
 import json
 import pathlib
 import shutil
@@ -818,7 +819,7 @@ def check_pull_request_comments(self, expect_message: str):
         response = json.loads(r.text)
         complete_comment = response[0]["body"]
 
-        if expect_message in complete_comment:
+        if re.search(expect_message, complete_comment):
             logging.info("Found the expected comment in the PR")
         else:
             pytest.fail(