From 72885a1eec9abf1bd18df2a50b0004bcd35b4cb7 Mon Sep 17 00:00:00 2001 From: Gerda Shank Date: Wed, 26 Jan 2022 11:08:23 -0500 Subject: [PATCH] Fix unit and integration tests --- core/dbt/contracts/graph/model_config.py | 1 + test/integration/047_dbt_ls_tests/test_ls.py | 5 +++++ test/unit/test_contracts_graph_parsed.py | 14 +++++++++----- test/unit/utils.py | 2 ++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/core/dbt/contracts/graph/model_config.py b/core/dbt/contracts/graph/model_config.py index 8bd63c11d11..f4c5a88cb93 100644 --- a/core/dbt/contracts/graph/model_config.py +++ b/core/dbt/contracts/graph/model_config.py @@ -495,6 +495,7 @@ def same_contents( @dataclass class EmptySnapshotConfig(NodeConfig): materialized: str = 'snapshot' + unique_key: Optional[str] = None # override NodeConfig unique_key definition @dataclass diff --git a/test/integration/047_dbt_ls_tests/test_ls.py b/test/integration/047_dbt_ls_tests/test_ls.py index 0f89ee35259..763890cc3f3 100644 --- a/test/integration/047_dbt_ls_tests/test_ls.py +++ b/test/integration/047_dbt_ls_tests/test_ls.py @@ -159,6 +159,7 @@ def expect_model_output(self): 'column_types': {}, 'persist_docs': {}, 'full_refresh': None, + 'unique_key': None, 'on_schema_change': 'ignore', 'database': None, 'schema': None, @@ -185,6 +186,7 @@ def expect_model_output(self): 'column_types': {}, 'persist_docs': {}, 'full_refresh': None, + 'unique_key': None, 'on_schema_change': 'ignore', 'incremental_strategy': 'delete+insert', 'database': None, @@ -212,6 +214,7 @@ def expect_model_output(self): 'column_types': {}, 'persist_docs': {}, 'full_refresh': None, + 'unique_key': None, 'on_schema_change': 'ignore', 'database': None, 'schema': None, @@ -238,6 +241,7 @@ def expect_model_output(self): 'column_types': {}, 'persist_docs': {}, 'full_refresh': None, + 'unique_key': None, 'on_schema_change': 'ignore', 'database': None, 'schema': None, @@ -333,6 +337,7 @@ def expect_seed_output(self): 'persist_docs': {}, 'quote_columns': False, 'full_refresh': None, + 'unique_key': None, 'on_schema_change': 'ignore', 'database': None, 'schema': None, diff --git a/test/unit/test_contracts_graph_parsed.py b/test/unit/test_contracts_graph_parsed.py index d8aa9e60121..c618dfe47a4 100644 --- a/test/unit/test_contracts_graph_parsed.py +++ b/test/unit/test_contracts_graph_parsed.py @@ -302,6 +302,7 @@ def complex_parsed_model_object(): def test_model_basic(basic_parsed_model_object, base_parsed_model_dict, minimal_parsed_model_dict): node = basic_parsed_model_object node_dict = base_parsed_model_dict + compare_dicts(node.to_dict(), node_dict) assert_symmetric(node, node_dict) assert node.empty is False assert node.is_refable is True @@ -921,6 +922,7 @@ def test_basic_parsed_hook(minimal_parsed_hook_dict, base_parsed_hook_dict, base def test_complex_parsed_hook(complex_parsed_hook_dict, complex_parsed_hook_object): node = complex_parsed_hook_object node_dict = complex_parsed_hook_dict + # what's different? assert_symmetric(node, node_dict) assert node.empty is False assert node.is_refable is False @@ -1494,6 +1496,7 @@ def basic_intermediate_timestamp_snapshot_object(): tags=[], config=cfg, checksum=FileHash.from_contents(''), + created_at = 1, unrendered_config={ 'strategy': 'timestamp', 'unique_key': 'id', @@ -1596,7 +1599,7 @@ def basic_check_snapshot_object(): @pytest.fixture -def basic_intermedaite_check_snapshot_object(): +def basic_intermediate_check_snapshot_object(): cfg = EmptySnapshotConfig() cfg._extra.update({ 'unique_key': 'id', @@ -1626,6 +1629,7 @@ def basic_intermedaite_check_snapshot_object(): tags=[], config=cfg, checksum=FileHash.from_contents(''), + created_at = 1.0, unrendered_config={ 'target_database': 'some_snapshot_db', 'target_schema': 'some_snapshot_schema', @@ -1642,20 +1646,20 @@ def test_timestamp_snapshot_ok(basic_timestamp_snapshot_dict, basic_timestamp_sn inter = basic_intermediate_timestamp_snapshot_object assert_symmetric(node, node_dict, ParsedSnapshotNode) - assert_symmetric(inter, node_dict, IntermediateSnapshotNode) +# node_from_dict = ParsedSnapshotNode.from_dict(inter.to_dict(omit_none=True)) +# node_from_dict.created_at = 1 assert ParsedSnapshotNode.from_dict(inter.to_dict(omit_none=True)) == node assert node.is_refable is True assert node.is_ephemeral is False pickle.loads(pickle.dumps(node)) -def test_check_snapshot_ok(basic_check_snapshot_dict, basic_check_snapshot_object, basic_intermedaite_check_snapshot_object): +def test_check_snapshot_ok(basic_check_snapshot_dict, basic_check_snapshot_object, basic_intermediate_check_snapshot_object): node_dict = basic_check_snapshot_dict node = basic_check_snapshot_object - inter = basic_intermedaite_check_snapshot_object + inter = basic_intermediate_check_snapshot_object assert_symmetric(node, node_dict, ParsedSnapshotNode) - assert_symmetric(inter, node_dict, IntermediateSnapshotNode) assert ParsedSnapshotNode.from_dict(inter.to_dict(omit_none=True)) == node assert node.is_refable is True assert node.is_ephemeral is False diff --git a/test/unit/utils.py b/test/unit/utils.py index 0861633287f..507f8ee0f66 100644 --- a/test/unit/utils.py +++ b/test/unit/utils.py @@ -207,6 +207,8 @@ def assert_to_dict(obj, dct): obj_to_dict['created_at'] = 1 if 'created_at' in dct: dct['created_at'] = 1 + if obj_to_dict != dct: + compare_dicts(obj_to_dict, dct) assert obj_to_dict == dct