Skip to content

Commit bd00434

Browse files
denikclaude
andcommitted
acceptance: don't apply Ignore filter to out* files
Inherited Ignore patterns (e.g. `databricks.yml` from bundle/test.toml) were silently swallowing output files in template tests, preventing them from being tracked and updated with -update. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 8fb16e5 commit bd00434

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

acceptance/acceptance_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ func runTest(t *testing.T,
682682
if _, ok := Ignored[relPath]; ok {
683683
continue
684684
}
685-
if config.CompiledIgnoreObject.MatchesPath(relPath) {
685+
if config.CompiledIgnoreObject.MatchesPath(relPath) && !strings.HasPrefix(relPath, "out") {
686686
continue
687687
}
688688
if strings.HasPrefix(filepath.Base(relPath), "LOG") {

acceptance/bundle/resources/postgres_branches/basic/script

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
22

33
cleanup() {
44
trace $CLI bundle destroy --auto-approve
5+
rm -f out.requests.txt
56
}
67
trap cleanup EXIT
78

acceptance/bundle/resources/postgres_branches/recreate/script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ cleanup() {
55

66
# Also try to delete the old branch directly in case it wasn't cleaned up
77
$CLI postgres delete-branch "projects/test-pg-proj-${UNIQUE_NAME}/branches/old-branch-${UNIQUE_NAME}" 2>/dev/null || true
8+
9+
rm -f out.requests.txt
810
}
911
trap cleanup EXIT
1012

@@ -51,5 +53,3 @@ print_requests destroy
5153

5254
# Clean up any orphaned old branch (terraform doesn't delete it on recreation)
5355
$CLI postgres delete-branch $branch_id_1 2>/dev/null || true
54-
55-
rm -f out.requests.txt

acceptance/bundle/resources/postgres_branches/test.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"]
1111

1212
Ignore = [
1313
"databricks.yml",
14-
"out.requests.txt",
1514
".databricks",
1615
]
1716

acceptance/bundle/resources/postgres_branches/update_protected/script

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
22

33
cleanup() {
44
trace $CLI bundle destroy --auto-approve
5+
rm -f out.requests.txt
56
}
67
trap cleanup EXIT
78

acceptance/bundle/resources/postgres_branches/without_branch_id/script

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
22

33
cleanup() {
44
$CLI bundle destroy --auto-approve > /dev/null 2>&1 || true
5+
rm -f out.requests.txt
56
}
67
trap cleanup EXIT
78

acceptance/bundle/templates/default-python/fail-missing-uv/script

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
trace $CLI bundle init default-python --config-file ./input.json --output-dir output
1+
trace $CLI bundle init default-python --config-file ./input.json --output-dir tmp
22

3-
cd output/fail_missing_uv
3+
cd tmp/fail_missing_uv
44
trace $CLI bundle validate
55

66
# Dynamically find ALL directories containing 'uv' and remove them from PATH
@@ -11,3 +11,5 @@ done
1111

1212
# Try to deploy, expect failure due to missing uv
1313
errcode trace $CLI bundle deploy
14+
15+
cd ../.. && rm -fr tmp

acceptance/bundle/templates/default-python/fail-missing-uv/test.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ Badness = "The error message is not ideal: it reports a generic build failure or
33
Local = true
44
Cloud = false
55

6-
Ignore = [
7-
'output/fail_missing_uv',
8-
]
9-
106
# Replace the uv not found error for portability
117
[[Repls]]
128
Old = '(/usr)?(/bin)?/bash(: line 1)?: uv: command not found'

0 commit comments

Comments
 (0)