Skip to content

Commit 3d50b7c

Browse files
committed
testdiff: leave repeated single values unnumbered
1 parent b694c4c commit 3d50b7c

30 files changed

Lines changed: 87 additions & 76 deletions

File tree

‎acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/output.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
"browse_only": false,
77
"catalog_name": "main",
88
"catalog_type": "MANAGED_CATALOG",
9-
"created_at": [UNIX_TIME_MILLIS][0],
9+
"created_at": [UNIX_TIME_MILLIS],
1010
"created_by": "[USERNAME]",
1111
"enable_predictive_optimization": "INHERIT",
1212
"full_name": "main.schema-[UNIQUE_NAME]",
1313
"metastore_id": "[UUID]",
1414
"name": "schema-[UNIQUE_NAME]",
1515
"owner": "[USERNAME]",
1616
"schema_id": "[UUID]",
17-
"updated_at": [UNIX_TIME_MILLIS][0],
17+
"updated_at": [UNIX_TIME_MILLIS],
1818
"updated_by": "[USERNAME]"
1919
}
2020

‎acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/output.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
"browse_only": false,
77
"catalog_name": "main",
88
"catalog_type": "MANAGED_CATALOG",
9-
"created_at": [UNIX_TIME_MILLIS][0],
9+
"created_at": [UNIX_TIME_MILLIS],
1010
"created_by": "[USERNAME]",
1111
"enable_predictive_optimization": "INHERIT",
1212
"full_name": "main.schema-[UNIQUE_NAME]",
1313
"metastore_id": "[UUID]",
1414
"name": "schema-[UNIQUE_NAME]",
1515
"owner": "[USERNAME]",
1616
"schema_id": "[UUID]",
17-
"updated_at": [UNIX_TIME_MILLIS][0],
17+
"updated_at": [UNIX_TIME_MILLIS],
1818
"updated_by": "[USERNAME]"
1919
}
2020

‎acceptance/bundle/deploy/readplan/whl-upload/output.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
=== bundle deploy uploads the wheel
33
>>> [CLI] bundle deploy
4-
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl...
4+
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
55
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/whl-upload/default/files...
66
Created jobs.my_job
77
Files: 2 uploaded, 0 deleted
@@ -10,7 +10,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
1010
>>> print_requests.py //artifacts/.internal --del-field raw_body
1111
{
1212
"method": "POST",
13-
"path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/whl-upload/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl",
13+
"path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/whl-upload/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl",
1414
"q": {
1515
"overwrite": "true"
1616
}
@@ -26,7 +26,7 @@ Destroy: 1 deleted
2626

2727
=== bundle deploy --plan also uploads the wheel
2828
>>> [CLI] bundle deploy --plan tmp.plan.json
29-
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl...
29+
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
3030
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/whl-upload/default/files...
3131
Created jobs.my_job
3232
Files: 4 uploaded, 0 deleted
@@ -35,7 +35,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
3535
>>> print_requests.py //artifacts/.internal --del-field raw_body
3636
{
3737
"method": "POST",
38-
"path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/whl-upload/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl",
38+
"path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/whl-upload/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl",
3939
"q": {
4040
"overwrite": "true"
4141
}

‎acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
>>> [CLI] bundle deploy
33
Building my_test_code...
4-
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl...
4+
Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
55
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
66
Created jobs.some_other_job
77
Files: 13 uploaded, 0 deleted
@@ -10,7 +10,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
1010
=== The environment dependency keeps its [train] extras suffix
1111
>>> [CLI] jobs get [SOME_OTHER_JOB_ID]
1212
[
13-
"/Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl[train]"
13+
"/Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl[train]"
1414
]
1515

1616
>>> [CLI] bundle run some_other_job

‎acceptance/bundle/migrate/command/default-python/out.state_after_migration.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"job_cluster_key": "job_cluster",
5151
"libraries": [
5252
{
53-
"whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
53+
"whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
5454
}
5555
],
5656
"notebook_task": {
@@ -67,7 +67,7 @@
6767
"job_cluster_key": "job_cluster",
6868
"libraries": [
6969
{
70-
"whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
70+
"whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
7171
}
7272
],
7373
"python_wheel_task": {

‎acceptance/bundle/migrate/command/default-python/out.state_original.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
"provider_config": [],
189189
"pypi": [],
190190
"requirements": "",
191-
"whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
191+
"whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
192192
}
193193
],
194194
"max_retries": 0,
@@ -262,7 +262,7 @@
262262
"provider_config": [],
263263
"pypi": [],
264264
"requirements": "",
265-
"whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
265+
"whl": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
266266
}
267267
],
268268
"max_retries": 0,

‎acceptance/bundle/migrate/command/grants/out.original_state.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
"browse_only": false,
173173
"catalog_name": "main",
174174
"comment": "mycomment",
175-
"created_at": [UNIX_TIME_MILLIS][0],
175+
"created_at": [UNIX_TIME_MILLIS],
176176
"created_by": "[USERNAME]",
177177
"full_name": "main.schema_grants.mymodel",
178178
"id": "main.schema_grants.mymodel",
@@ -186,7 +186,7 @@
186186
],
187187
"schema_name": "schema_grants",
188188
"storage_location": null,
189-
"updated_at": [UNIX_TIME_MILLIS][0],
189+
"updated_at": [UNIX_TIME_MILLIS],
190190
"updated_by": "[USERNAME]"
191191
},
192192
"sensitive_attributes": [],

‎acceptance/bundle/resources/dashboards/detect-change/out.plan.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
"serialized_dashboard": {
6666
"action": "skip",
6767
"reason": "etag_based",
68-
"old": "sha256:[HASH][0]",
69-
"new": "sha256:[HASH][0]",
68+
"old": "sha256:[HASH]",
69+
"new": "sha256:[HASH]",
7070
"remote": "{}\n"
7171
},
7272
"update_time": {

‎acceptance/bundle/resources/job_runs/retried_run_now/output.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
1818
"method": "POST",
1919
"path": "/api/2.2/jobs/run-now",
2020
"body": {
21-
"idempotency_token": "[IDEMPOTENCY_TOKEN][0]",
21+
"idempotency_token": "[IDEMPOTENCY_TOKEN]",
2222
"job_id": [MY_JOB_ID]
2323
}
2424
}
2525
{
2626
"method": "POST",
2727
"path": "/api/2.2/jobs/run-now",
2828
"body": {
29-
"idempotency_token": "[IDEMPOTENCY_TOKEN][0]",
29+
"idempotency_token": "[IDEMPOTENCY_TOKEN]",
3030
"job_id": [MY_JOB_ID]
3131
}
3232
}

‎acceptance/bundle/resources/model_serving_endpoints/basic/out.second-plan.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ json.serial = 1;
55
json.plan.resources.model_serving_endpoints.my_endpoint.action = "recreate";
66
json.plan.resources.model_serving_endpoints.my_endpoint.new_state.value.name = "[ENDPOINT_NAME_2]";
77
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.description = "";
8-
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.creation_timestamp = [UNIX_TIME_MILLIS][0];
8+
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.creation_timestamp = [UNIX_TIME_MILLIS];
99
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.creator = "[USERNAME]";
1010
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.description = "";
1111
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.id = "[ENDPOINT_ID_1]";
12-
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.last_updated_timestamp = [UNIX_TIME_MILLIS][0];
12+
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.last_updated_timestamp = [UNIX_TIME_MILLIS];
1313
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.name = "[ENDPOINT_NAME_1]";
1414
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.permission_level = "CAN_MANAGE";
1515
json.plan.resources.model_serving_endpoints.my_endpoint.remote_state.endpoint_details.route_optimized = false;

0 commit comments

Comments
 (0)