Skip to content

Commit d2362e2

Browse files
committed
wal tests: remove redundant server stubs covered by default handlers
Co-authored-by: Isaac
1 parent 284c4db commit d2362e2

4 files changed

Lines changed: 6 additions & 29 deletions

File tree

acceptance/bundle/deploy/wal/chain-3-jobs/output.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Exit code: [KILLED]
1717
{
1818
"k": "resources.jobs.job_01",
1919
"v": {
20-
"__id__": "1001",
20+
"__id__": "[NUMID]",
2121
"state": {
2222
"deployment": {
2323
"kind": "BUNDLE",
@@ -49,7 +49,7 @@ Exit code: [KILLED]
4949
{
5050
"k": "resources.jobs.job_02",
5151
"v": {
52-
"__id__": "1001",
52+
"__id__": "[NUMID]",
5353
"depends_on": [
5454
{
5555
"label": "${resources.jobs.job_01.id}",
@@ -61,7 +61,7 @@ Exit code: [KILLED]
6161
"kind": "BUNDLE",
6262
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/wal-chain-test/default/state/metadata.json"
6363
},
64-
"description": "depends on 1001",
64+
"description": "depends on [NUMID]",
6565
"edit_mode": "UI_LOCKED",
6666
"format": "MULTI_TASK",
6767
"max_concurrent_runs": 1,
@@ -98,10 +98,10 @@ Resources:
9898
Jobs:
9999
job_01:
100100
Name: job-01
101-
URL: [DATABRICKS_URL]/jobs/1001?o=[NUMID]
101+
URL: [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
102102
job_02:
103103
Name: job-02
104-
URL: [DATABRICKS_URL]/jobs/1001?o=[NUMID]
104+
URL: [DATABRICKS_URL]/jobs/[NUMID]?o=[NUMID]
105105
job_03:
106106
Name: job-03
107107
URL: (not deployed)
Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,2 @@
11
# Linear chain: job_01 -> job_02 -> job_03
22
# Let first 2 jobs/create succeed, then kill on the 3rd
3-
4-
[[Server]]
5-
Pattern = "POST /api/2.2/jobs/create"
6-
Response.Body = '{"job_id": 1001}'
7-
8-
[[Server]]
9-
Pattern = "POST /api/2.2/jobs/reset"
10-
Response.Body = '{}'
11-
12-
[[Server]]
13-
Pattern = "GET /api/2.2/jobs/get"
14-
Response.Body = '{"job_id": 1001, "settings": {"name": "test-job"}}'

acceptance/bundle/deploy/wal/crash-after-create/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Exit code: [KILLED]
99
=== WAL should exist after crash ===
1010
WAL exists (expected)
1111
{"lineage":"[UUID]","serial":1,"state_version":2,"cli_version":"[DEV_VERSION]"}
12-
{"k":"resources.jobs.job_a","v":{"__id__":"1001","state":{"deployment":{"kind":"BUNDLE","metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/wal-crash-test/default/state/metadata.json"},"description":"first job","edit_mode":"UI_LOCKED","format":"MULTI_TASK","max_concurrent_runs":1,"name":"test-job-a","queue":{"enabled":true},"tasks":[{"new_cluster":{"node_type_id":"[NODE_TYPE_ID]","spark_version":"15.4.x-scala2.12"},"spark_python_task":{"python_file":"/Workspace/Users/[USERNAME]/.bundle/wal-crash-test/default/files/test.py"},"task_key":"task-a"}]}}}
12+
{"k":"resources.jobs.job_a","v":{"__id__":"[NUMID]","state":{"deployment":{"kind":"BUNDLE","metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/wal-crash-test/default/state/metadata.json"},"description":"first job","edit_mode":"UI_LOCKED","format":"MULTI_TASK","max_concurrent_runs":1,"name":"test-job-a","queue":{"enabled":true},"tasks":[{"new_cluster":{"node_type_id":"[NODE_TYPE_ID]","spark_version":"15.4.x-scala2.12"},"spark_python_task":{"python_file":"/Workspace/Users/[USERNAME]/.bundle/wal-crash-test/default/files/test.py"},"task_key":"task-a"}]}}}
1313
=== State file after crash (should be empty) ===
1414
cat: .databricks/bundle/default/resources.json: No such file or directory
1515

acceptance/bundle/deploy/wal/crash-after-create/test.toml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,3 @@
22
# Second deploy recovers from WAL and completes successfully.
33
# job_b depends on job_a, so jobs/get is called after job_a's SaveState.
44

5-
[[Server]]
6-
Pattern = "POST /api/2.2/jobs/create"
7-
Response.Body = '{"job_id": 1001}'
8-
9-
[[Server]]
10-
Pattern = "POST /api/2.2/jobs/reset"
11-
Response.Body = '{}'
12-
13-
[[Server]]
14-
Pattern = "GET /api/2.2/jobs/get"
15-
Response.Body = '{"job_id": 1001, "settings": {"name": "test-job"}}'

0 commit comments

Comments
 (0)