Runtime Tests: Make EXPECT_NONE operate on plain text (not regex) pat…

…terns EXPECT_REGEX_NONE is introduced to preserve the old behaviour.
delphix · Mar 12, 2024 · b1dd370 · b1dd370
1 parent a80798e
commit b1dd370
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/tests/runtime/engine/parser.py b/tests/runtime/engine/parser.py
@@ -135,9 +135,11 @@ def __read_test_struct(test, test_suite):
                 prog = line
             elif item_name == 'EXPECT':
                 expects.append(Expect(line, 'text'))
+            elif item_name == 'EXPECT_NONE':
+                expects.append(Expect(line, 'text_none'))
             elif item_name == 'EXPECT_REGEX':
                 expects.append(Expect(line, 'regex'))
-            elif item_name == 'EXPECT_NONE':
+            elif item_name == 'EXPECT_REGEX_NONE':
                 expects.append(Expect(line, 'regex_none'))
             elif item_name == 'EXPECT_FILE':
                 has_exact_expect = True

diff --git a/tests/runtime/engine/runner.py b/tests/runtime/engine/runner.py
@@ -207,6 +207,8 @@ def check_expect(expect, output):
                 if expect.mode == "text":
                     # Raw text match on an entire line, ignoring leading/trailing whitespace
                     return re.search(f"^\s*{re.escape(expect.expect)}\s*$", output, re.M)
+                elif expect.mode == "text_none":
+                    return not re.search(f"^\s*{re.escape(expect.expect)}\s*$", output, re.M)
                 elif expect.mode == "regex":
                     return re.search(expect.expect, output, re.M)
                 elif expect.mode == "regex_none":
@@ -458,6 +460,9 @@ def print_befores_and_after_output():
                 if failed_expect.mode == "text":
                     print('\tExpected: ' + failed_expect.expect)
                     print('\tFound:\n' + to_utf8(output))
+                elif failed_expect.mode == "text_none":
+                    print('\tExpected no: ' + failed_expect.expect)
+                    print('\tFound:\n' + to_utf8(output))
                 elif failed_expect.mode == "regex":
                     print('\tExpected REGEX: ' + failed_expect.expect)
                     print('\tFound:\n' + to_utf8(output))