From 406cd3f894184cfbf7d214cdc27938d7897fa191 Mon Sep 17 00:00:00 2001 From: Denis Bilenko <denis.bilenko@databricks.com> Date: Fri, 14 Feb 2025 13:15:33 +0100 Subject: [PATCH] do not add 'trace' in front of diff.py to avoid slashes difference on Windows --- .../default-python/serverless-auto-disabled/output.txt | 2 -- .../templates/default-python/serverless-auto-disabled/script | 2 +- .../default-python/serverless-auto-enabled/output.txt | 2 -- .../templates/default-python/serverless-auto-enabled/script | 2 +- .../templates/default-python/serverless-auto-error/output.txt | 2 -- .../templates/default-python/serverless-auto-error/script | 4 ++-- 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/acceptance/bundle/templates/default-python/serverless-auto-disabled/output.txt b/acceptance/bundle/templates/default-python/serverless-auto-disabled/output.txt index f79592ca4..6abf52cf0 100644 --- a/acceptance/bundle/templates/default-python/serverless-auto-disabled/output.txt +++ b/acceptance/bundle/templates/default-python/serverless-auto-disabled/output.txt @@ -8,5 +8,3 @@ Workspace to use (auto-detected, edit in 'my_default_python/databricks.yml'): [D Please refer to the README.md file for "getting started" instructions. See also the documentation at https://docs.databricks.com/dev-tools/bundles/index.html. - ->>> diff.py [TESTROOT]/bundle/templates/default-python/serverless-auto-disabled/../classic/output output/ diff --git a/acceptance/bundle/templates/default-python/serverless-auto-disabled/script b/acceptance/bundle/templates/default-python/serverless-auto-disabled/script index 8049fb401..ede33c2c9 100644 --- a/acceptance/bundle/templates/default-python/serverless-auto-disabled/script +++ b/acceptance/bundle/templates/default-python/serverless-auto-disabled/script @@ -2,6 +2,6 @@ trace $CLI bundle init default-python --config-file ./input.json --output-dir ou mv output/my_default_python/.gitignore output/my_default_python/out.gitignore # serverless is disabled, same output as for classic -trace diff.py $TESTDIR/../classic/output output/ +diff.py $TESTDIR/../classic/output output/ rm -fr output diff --git a/acceptance/bundle/templates/default-python/serverless-auto-enabled/output.txt b/acceptance/bundle/templates/default-python/serverless-auto-enabled/output.txt index 167b0ae72..6abf52cf0 100644 --- a/acceptance/bundle/templates/default-python/serverless-auto-enabled/output.txt +++ b/acceptance/bundle/templates/default-python/serverless-auto-enabled/output.txt @@ -8,5 +8,3 @@ Workspace to use (auto-detected, edit in 'my_default_python/databricks.yml'): [D Please refer to the README.md file for "getting started" instructions. See also the documentation at https://docs.databricks.com/dev-tools/bundles/index.html. - ->>> diff.py [TESTROOT]/bundle/templates/default-python/serverless-auto-enabled/../serverless/output output/ diff --git a/acceptance/bundle/templates/default-python/serverless-auto-enabled/script b/acceptance/bundle/templates/default-python/serverless-auto-enabled/script index edb6007db..a8c748002 100644 --- a/acceptance/bundle/templates/default-python/serverless-auto-enabled/script +++ b/acceptance/bundle/templates/default-python/serverless-auto-enabled/script @@ -2,6 +2,6 @@ trace $CLI bundle init default-python --config-file ./input.json --output-dir ou mv output/my_default_python/.gitignore output/my_default_python/out.gitignore # serverless is enabled, same output as serverless enabled explicitly: -trace diff.py $TESTDIR/../serverless/output output/ +diff.py $TESTDIR/../serverless/output output/ rm -fr output diff --git a/acceptance/bundle/templates/default-python/serverless-auto-error/output.txt b/acceptance/bundle/templates/default-python/serverless-auto-error/output.txt index 56a631b6e..08991d199 100644 --- a/acceptance/bundle/templates/default-python/serverless-auto-error/output.txt +++ b/acceptance/bundle/templates/default-python/serverless-auto-error/output.txt @@ -9,5 +9,3 @@ Workspace to use (auto-detected, edit in 'my_default_python/databricks.yml'): [D Please refer to the README.md file for "getting started" instructions. See also the documentation at https://docs.databricks.com/dev-tools/bundles/index.html. - ->>> diff.py [TESTROOT]/bundle/templates/default-python/serverless-auto-error/../classic/output output/ diff --git a/acceptance/bundle/templates/default-python/serverless-auto-error/script b/acceptance/bundle/templates/default-python/serverless-auto-error/script index 9a969aca1..335436049 100644 --- a/acceptance/bundle/templates/default-python/serverless-auto-error/script +++ b/acceptance/bundle/templates/default-python/serverless-auto-error/script @@ -1,6 +1,6 @@ trace $CLI bundle init default-python --config-file ./input.json --output-dir output mv output/my_default_python/.gitignore output/my_default_python/out.gitignore -# Could not check if serverless is enabled, same output as classic: -trace diff.py $TESTDIR/../classic/output output/ +# If serverless is "auto" and there was an error reaching settings-api, we should get the same output as 'classic' +diff.py $TESTDIR/../classic/output output/ rm -fr output