From 7c5c54abb3186f697745023d8fb9d95274e906df Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 28 Aug 2024 20:44:32 -0500 Subject: [PATCH] [Backport 1.7.latest] Fix test after dbt-utils release (#10627) * rework test to ignore utils version (#10625) # Conflicts: # tests/functional/dependencies/test_dependency_options.py * fix spacing for 1.7 --- .../dependencies/test_dependency_options.py | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/tests/functional/dependencies/test_dependency_options.py b/tests/functional/dependencies/test_dependency_options.py index a421baf8590..8c6f7fca8f9 100644 --- a/tests/functional/dependencies/test_dependency_options.py +++ b/tests/functional/dependencies/test_dependency_options.py @@ -32,16 +32,14 @@ def test_deps_lock(self, clean_start): assert os.path.exists("package-lock.yml") with open("package-lock.yml") as fp: contents = fp.read() - assert ( - contents - == """packages: -- package: fivetran/fivetran_utils - version: 0.4.7 -- package: dbt-labs/dbt_utils - version: 1.2.0 -sha1_hash: 71304bca2138cf8004070b3573a1e17183c0c1a8 -""" - ) + + fivetran_package = "- package: fivetran/fivetran_utils\n version: 0.4.7" + # dbt-utils is a dep in fivetran so we can't check for a specific version or this test fails everytime a new dbt-utils version comes out + dbt_labs_package = "- package: dbt-labs/dbt_utils" + package_sha = "sha1_hash: 71304bca2138cf8004070b3573a1e17183c0c1a8" + assert fivetran_package in contents + assert dbt_labs_package in contents + assert package_sha in contents def test_deps_default(self, clean_start): run_dbt(["deps"]) @@ -49,16 +47,13 @@ def test_deps_default(self, clean_start): assert os.path.exists("package-lock.yml") with open("package-lock.yml") as fp: contents = fp.read() - assert ( - contents - == """packages: -- package: fivetran/fivetran_utils - version: 0.4.7 -- package: dbt-labs/dbt_utils - version: 1.2.0 -sha1_hash: 71304bca2138cf8004070b3573a1e17183c0c1a8 -""" - ) + fivetran_package = "- package: fivetran/fivetran_utils\n version: 0.4.7" + # dbt-utils is a dep in fivetran so we can't check for a specific version or this test fails everytime a new dbt-utils version comes out + dbt_labs_package = "- package: dbt-labs/dbt_utils" + package_sha = "sha1_hash: 71304bca2138cf8004070b3573a1e17183c0c1a8" + assert fivetran_package in contents + assert dbt_labs_package in contents + assert package_sha in contents def test_deps_add(self, clean_start): run_dbt(["deps", "--add-package", "dbt-labs/audit_helper@0.9.0"])