Skip to content

acceptance: make contains.py fail the test on a failed assertion #5466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pietern merged 1 commit into from
Jun 8, 2026
+19 −7
Merged

acceptance: make contains.py fail the test on a failed assertion #5466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions acceptance/bin/contains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
must_find.append(arg)

found = set()
failed = False

for line in sys.stdin:
sys.stdout.write(line)
Expand All @@ -19,9 +20,16 @@
for t in must_not_find:
if t in line:
sys.stderr.write(f"contains error: {t!r} was not expected: {line.strip()!r}\n")
failed = True

sys.stdout.flush()

not_found = set(must_find) - found
for item in sorted(not_found):
sys.stderr.write(f"contains error: {item!r} not found in the output.\n")
failed = True

# Exit non-zero so a failed assertion aborts the script (set -e -o pipefail)
# instead of silently baking the error line into the expected output.
if failed:
sys.exit(1)
2 changes: 0 additions & 2 deletions acceptance/bundle/state/state_present/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ Deployment complete!
>>> print_state.py
3
13
contains error: '11' not found in the output.

>>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
Expand All @@ -92,7 +91,6 @@ Deployment complete!
>>> print_state.py
3
13
contains error: '12' not found in the output.

>>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle debug states
[TEST_TMP_DIR]/.databricks/bundle/default/terraform/terraform.tfstate: local terraform state serial=3 lineage="test-lineage"
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/state/state_present/script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle destroy --auto-approve
rm out.requests.txt
trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
trace print_requests.py //api/2.1/unity-catalog/schemas | jq '.headers["User-Agent"][0]' | contains.py 'engine/direct' '!terraform' '!tf-provider'
trace print_state.py | jq .serial | contains.py "11"
trace print_state.py | jq .serial | contains.py "13"

trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
#trace print_requests.py --get //api/2.1/unity-catalog/schemas | jq '.headers["User-Agent"][0]' | contains.py 'engine/direct' '!terraform' '!tf-provider'

trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle deploy
trace print_requests.py --get //api/2.1/unity-catalog/schemas | jq '.headers["User-Agent"][0]' | contains.py 'engine/direct' '!terraform' '!tf-provider'
trace print_state.py | jq .serial | contains.py "12"
trace print_state.py | jq .serial | contains.py "13"

trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states
trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states --force-pull
Expand Down
6 changes: 6 additions & 0 deletions acceptance/selftest/contains/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
Hello world
contains error: 'not_found' not found in the output.

Exit code: 1

=== This should complain about not_found not found
>>> musterr python3 ./failure.py
Failed script
contains error: 'not_found' not found in the output.

Exit code: 1

=== This should not complain
>>> python3 ./success.py
Hello world
Expand All @@ -22,6 +26,8 @@ Failed script
Hello world
contains error: 'Hello' was not expected: 'Hello world'

Exit code: 1

=== This should not complain
>>> python3 ./success.py
Hello world
6 changes: 3 additions & 3 deletions acceptance/selftest/contains/script
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
title "This should complain about not_found not found"
trace python3 ./success.py | contains.py not_found
trace python3 ./success.py | errcode contains.py not_found

title "This should complain about not_found not found"
trace musterr python3 ./failure.py | contains.py not_found
trace musterr python3 ./failure.py | errcode contains.py not_found

title "This should not complain"
trace python3 ./success.py | contains.py world Hello
Expand All @@ -11,7 +11,7 @@ title "This should not complain"
trace musterr python3 ./failure.py | contains.py Failed

title "This should complain about Hello present in output"
trace python3 ./success.py | contains.py !Hello
trace python3 ./success.py | errcode contains.py !Hello

title "This should not complain"
trace python3 ./success.py | contains.py !not_found
Loading