Skip to content

Commit 6592ee9

Browse files
Remove out.requests.txt golden files from DMS tests
Print requests inline in output.txt and clear remaining requests at the end of each script so out.requests.txt is not generated. Also update sequential-deploys test to add/remove resources across deploys, asserting create and delete operations are captured. Co-authored-by: Isaac
1 parent 0386ee6 commit 6592ee9

8 files changed

Lines changed: 41 additions & 261 deletions

File tree

acceptance/bundle/dms/add-resources/out.requests.txt

Lines changed: 0 additions & 143 deletions
This file was deleted.

acceptance/bundle/dms/add-resources/script

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ trace print_requests.py --get //bundle ^//workspace-files ^//import-file
3131
# Clean up.
3232
rm -rf .databricks
3333
$CLI bundle destroy --auto-approve > /dev/null 2>&1
34+
# Clear remaining requests so out.requests.txt is not generated.
35+
print_requests.py --get > /dev/null 2>&1 || true

acceptance/bundle/dms/deploy-error/script

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ trace musterr $CLI bundle deploy
33

44
# Print the metadata service requests to verify the failed operation is reported.
55
trace print_requests.py --get //bundle ^//workspace-files ^//import-file
6+
# Clear remaining requests so out.requests.txt is not generated.
7+
print_requests.py --get > /dev/null 2>&1 || true

acceptance/bundle/dms/plan-and-summary/out.requests.txt

Lines changed: 0 additions & 116 deletions
This file was deleted.

acceptance/bundle/dms/plan-and-summary/script

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ trace print_requests.py --get //bundle ^//workspace-files ^//import-file
1313

1414
# Clean up.
1515
$CLI bundle destroy --auto-approve > /dev/null 2>&1
16+
# Clear remaining requests so out.requests.txt is not generated.
17+
print_requests.py --get > /dev/null 2>&1 || true

acceptance/bundle/dms/release-lock-error/script

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ trace $CLI bundle deploy
66

77
# Print the metadata service requests to verify the lock release was attempted.
88
trace print_requests.py --get //bundle ^//workspace-files ^//import-file
9+
# Clear remaining requests so out.requests.txt is not generated.
10+
print_requests.py --get > /dev/null 2>&1 || true

acceptance/bundle/dms/script

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ trace $CLI bundle destroy --auto-approve
99

1010
# Print all metadata service requests made during destroy.
1111
trace print_requests.py --get //bundle ^//workspace-files ^//import-file
12+
# Clear remaining requests so out.requests.txt is not generated.
13+
print_requests.py --get > /dev/null 2>&1 || true
Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,36 @@
1-
# Deploy three times in sequence to verify version numbers increment.
1+
# Deploy with one job.
22
trace $CLI bundle deploy
3+
4+
# Add a second job and redeploy.
5+
cat > databricks.yml << 'EOF'
6+
bundle:
7+
name: sequential-deploys-test
8+
9+
resources:
10+
jobs:
11+
test_job:
12+
name: test-job
13+
new_job:
14+
name: new-job
15+
EOF
316
trace $CLI bundle deploy
17+
18+
# Remove the first job and redeploy (should delete test_job).
19+
cat > databricks.yml << 'EOF'
20+
bundle:
21+
name: sequential-deploys-test
22+
23+
resources:
24+
jobs:
25+
new_job:
26+
name: new-job
27+
EOF
428
trace $CLI bundle deploy
529

6-
# Print metadata service requests. Version IDs should be 1, 2, 3.
30+
# Print metadata service requests across all three deploys.
31+
# Version 1: CREATE test_job
32+
# Version 2: CREATE new_job (test_job unchanged)
33+
# Version 3: DELETE test_job (new_job unchanged)
734
trace print_requests.py --get //bundle ^//workspace-files ^//import-file
35+
# Clear remaining requests so out.requests.txt is not generated.
36+
print_requests.py --get > /dev/null 2>&1 || true

0 commit comments

Comments
 (0)