Undo unnecessary adjustments in tests

Author: anuunchin

dlt/destinations/decorators.py

@@ -201,6 +201,7 @@ def destination(
 def destination(
     func_or_name: Union[Optional[AnyFun], str] = None,
     /,
+    *,
     loader_file_format: TLoaderFileFormat = None,
     batch_size: int = 10,
     name: str = None,

tests/destinations/test_custom_destination.py

@@ -25,8 +25,6 @@
 from tests.load.utils import (
     assert_all_data_types_row,
 )
-from tests.utils import preserve_environ
-
 
 SUPPORTED_LOADER_FORMATS = ["parquet", "typed-jsonl"]
 
@@ -160,22 +158,7 @@ def test_capabilities() -> None:
     assert dict(caps) == dict(client_caps)
 
 
-@pytest.mark.parametrize(
-    "use_factory_method",
-    [True, False],
-    ids=["use_factory_method", "use_from_reference"],
-)
-def test_instantiation(use_factory_method: bool) -> None:
-    """
-    Test custom destination instantiation.
-
-    Args:
-        use_factory_method (bool): If True, uses `dlt.destination()` (which calls
-            `Destination.from_reference()` internally). If False, calls
-            `Destination.from_reference()` directly. Both should behave identically.
-    """
-    dest_ref_func = dlt.destination if use_factory_method else Destination.from_reference
-
+def test_instantiation() -> None:
     # also tests DESTINATIONS registry
     calls: List[Tuple[TDataItems, TTableSchema]] = []
 
@@ -201,7 +184,7 @@ def local_sink_func(items: TDataItems, table: TTableSchema, my_val=dlt.config.va
     calls = []
     p = dlt.pipeline(
         "sink_test",
-        destination=dest_ref_func("destination", destination_callable=local_sink_func),
+        destination=Destination.from_reference("destination", destination_callable=local_sink_func),
         dev_mode=True,
     )
     p.run([1, 2, 3], table_name="items")
@@ -217,7 +200,9 @@ def local_sink_func_no_params(items: TDataItems, table: TTableSchema) -> None:
 
     p = dlt.pipeline(
         "sink_test",
-        destination=dest_ref_func("destination", destination_callable=local_sink_func_no_params),
+        destination=Destination.from_reference(
+            "destination", destination_callable=local_sink_func_no_params
+        ),
         dev_mode=True,
     )
     p.run([1, 2, 3], table_name="items")
@@ -226,11 +211,10 @@ def local_sink_func_no_params(items: TDataItems, table: TTableSchema) -> None:
     global global_calls
     global_calls = []
     # this is technically possible but should not be used
-    dest_ref = dest_ref_func(
+    dest_ref = Destination.from_reference(
         "destination",
         destination_callable="tests.destinations.test_custom_destination.global_sink_func",
     )
-
     assert dest_ref.destination_name == "global_sink_func"
     # type comes from the "destination" wrapper destination
     assert dest_ref.destination_type == "dlt.destinations.destination"
@@ -260,11 +244,10 @@ def local_sink_func_no_params(items: TDataItems, table: TTableSchema) -> None:
     assert len(global_calls) == 2
 
     # we can import type (it is not a ref)
-    dest_ref = dest_ref_func(
+    dest_ref = Destination.from_reference(
         "tests.destinations.test_custom_destination.GlobalSinkFuncDestination",
         destination_name="alt_name",
     )
-
     assert dest_ref.destination_name == "alt_name"
     assert (
         dest_ref.destination_type
@@ -280,7 +263,9 @@ def local_sink_func_no_params(items: TDataItems, table: TTableSchema) -> None:
     assert len(global_calls) == 3
 
     # now import by ref
-    dest_ref = dest_ref_func("tests.destinations.test_custom_destination.global_sink_func")
+    dest_ref = Destination.from_reference(
+        "tests.destinations.test_custom_destination.global_sink_func"
+    )
     assert dest_ref.destination_name == "global_sink_func"
     assert (
         dest_ref.destination_type
@@ -298,7 +283,7 @@ def local_sink_func_no_params(items: TDataItems, table: TTableSchema) -> None:
     # pass None as callable arg will fail on load
     p = dlt.pipeline(
         "sink_test",
-        destination=dest_ref_func("destination", destination_callable=None),
+        destination=Destination.from_reference("destination", destination_callable=None),
         dev_mode=True,
     )
     with pytest.raises(ConfigurationValueError):
@@ -308,7 +293,9 @@ def local_sink_func_no_params(items: TDataItems, table: TTableSchema) -> None:
     with pytest.raises(UnknownCustomDestinationCallable):
         p = dlt.pipeline(
             "sink_test",
-            destination=dest_ref_func("destination", destination_callable="does.not.exist"),
+            destination=Destination.from_reference(
+                "destination", destination_callable="does.not.exist"
+            ),
             dev_mode=True,
         )
 

tests/load/duckdb/test_duckdb_client.py

@@ -307,22 +307,7 @@ def test_credentials_wrong_config() -> None:
 
 
 @pytest.mark.no_load
-@pytest.mark.parametrize(
-    "use_factory_method",
-    [True, False],
-    ids=["use_factory_method", "use_from_reference"],
-)
-def test_duckdb_in_memory_mode_via_factory(use_factory_method: bool):
-    """
-    Tests duckdb in-memory mode validation (rejecting :memory: credentials).
-
-    Args:
-        use_factory_method (bool): If True, uses `dlt.destination()` (which calls
-            `Destination.from_reference()` internally). If False, calls
-            `Destination.from_reference()` directly. Both should behave identically.
-    """
-    dest_ref_func = dlt.destination if use_factory_method else Destination.from_reference
-
+def test_duckdb_in_memory_mode_via_factory():
     import duckdb
 
     # Check if passing external duckdb connection works fine
@@ -351,7 +336,7 @@ def test_duckdb_in_memory_mode_via_factory(use_factory_method: bool):
     with pytest.raises(PipelineStepFailed) as exc:
         p = dlt.pipeline(
             pipeline_name="booboo",
-            destination=dest_ref_func("duckdb", credentials=":memory:"),
+            destination=Destination.from_reference("duckdb", credentials=":memory:"),
         )
         p.run([1, 2, 3], table_name="numbers")
 

tests/load/pipeline/test_pipelines.py

@@ -1132,27 +1132,37 @@ def events_timezone_unset():
             assert actual == expected
 
 
-@pytest.mark.parametrize(
-    "use_factory_method",
-    [True, False],
-    ids=["use_factory_method", "use_from_reference"],
-)
-def test_pipeline_with_destination_name(use_factory_method: bool):
-    """
-    Test configured destination name (tests/.dlt/config.toml).
+def test_pipeline_with_destination_name() -> None:
+    # test configured destination name (tests/.dlt/config.toml)
+    pipeline = dlt.pipeline(destination="custom_name")
+    assert pipeline.destination.destination_type == "dlt.destinations.duckdb"
+    assert pipeline.destination.destination_name == "custom_name"
 
-    Args:
-        use_factory_method (bool): If True, uses `dlt.destination()` (which calls
-            `Destination.from_reference()` internally). If False, calls
-            `Destination.from_reference()` directly. Both should behave identically.
-    """
-    # dlt.destination(name) if the factory method is enabled,
-    # or just using the plain name otherwise
-    dest_ref_func: Any = (
-        (lambda name: dlt.destination(name)) if use_factory_method else (lambda name: name)
-    )
+    @dlt.resource
+    def test_data():
+        yield [{"id": 1, "name": "test"}]
+
+    info = pipeline.run(test_data())
+    assert_load_info(info)
+
+    # test unconfigured destination name
+    with pytest.raises(UnknownDestinationModule) as py_exc:
+        dlt.pipeline(destination="another_custom_name")
+    assert py_exc.value.named_dest_attempted is True
+    assert not py_exc.value.destination_type
+    assert "no destination type was configured" in str(py_exc.value)
+
+    # if destination contains dots, no fallbacks must happen
+    with pytest.raises(UnknownDestinationModule) as py_exc:
+        dlt.pipeline(destination="dlt.destinations.unknown")
+    assert not py_exc.value.named_dest_attempted
+    assert not py_exc.value.destination_type
+
+
+def test_pipeline_with_destination_name_via_factory_initializer() -> None:
+    # test configured destination name (tests/.dlt/config.toml) via dlt.destination()
 
-    pipeline = dlt.pipeline(destination=dest_ref_func("custom_name"))
+    pipeline = dlt.pipeline(destination=dlt.destination("custom_name"))
     assert pipeline.destination.destination_type == "dlt.destinations.duckdb"
     assert pipeline.destination.destination_name == "custom_name"
 
@@ -1165,13 +1175,13 @@ def test_data():
 
     # test unconfigured destination name
     with pytest.raises(UnknownDestinationModule) as py_exc:
-        dlt.pipeline(destination=dest_ref_func("another_custom_name"))
+        dlt.pipeline(destination=dlt.destination("another_custom_name"))
     assert py_exc.value.named_dest_attempted is True
     assert not py_exc.value.destination_type
     assert "no destination type was configured" in str(py_exc.value)
 
     # if destination contains dots, no fallbacks must happen
     with pytest.raises(UnknownDestinationModule) as py_exc:
-        dlt.pipeline(destination=dest_ref_func("dlt.destinations.unknown"))
+        dlt.pipeline(destination=dlt.destination("dlt.destinations.unknown"))
     assert not py_exc.value.named_dest_attempted
     assert not py_exc.value.destination_type

tests/load/pipeline/test_postgres.py

@@ -56,39 +56,22 @@ def test_postgres_encoded_binary(
     assert data["table"][0]["hash"].tobytes() == blob
 
 
+# do not remove - it allows us to filter tests by destination
 @pytest.mark.no_load
-@pytest.mark.parametrize(
-    "use_factory_method",
-    [True, False],
-    ids=["use_factory_method", "use_from_reference"],
-)
 @pytest.mark.parametrize(
     "destination_config",
     destinations_configs(default_sql_configs=True, subset=["postgres"]),
     ids=lambda x: x.name,
 )
 def test_pipeline_explicit_destination_credentials(
-    use_factory_method: bool,
     destination_config: DestinationTestConfiguration,
 ) -> None:
-    """
-    Tests that explicit destination credentials.
-
-    Args:
-        use_factory_method (bool): If True, uses `dlt.destination()` (which calls
-            `Destination.from_reference()` internally). If False, calls
-            `Destination.from_reference()` directly. Both should behave identically.
-        destination_config (DestinationTestConfiguration): Test configuration for the destination.
-            This allows filtering tests by destination type. Do not remove.
-    """
     from dlt.destinations import postgres
     from dlt.destinations.impl.postgres.configuration import PostgresCredentials
 
-    dest_ref_func = dlt.destination if use_factory_method else Destination.from_reference
-
     # explicit credentials resolved
     p = dlt.pipeline(
-        destination=dest_ref_func(
+        destination=Destination.from_reference(
             "postgres",
             destination_name="mydest",
             credentials="postgresql://loader:loader@localhost:7777/dlt_data",
@@ -101,7 +84,7 @@ def test_pipeline_explicit_destination_credentials(
     # explicit credentials resolved ignoring the config providers
     os.environ["DESTINATION__MYDEST__CREDENTIALS__HOST"] = "HOST"
     p = dlt.pipeline(
-        destination=dest_ref_func(
+        destination=Destination.from_reference(
             "postgres",
             destination_name="mydest",
             credentials="postgresql://loader:loader@localhost:5432/dlt_data",
@@ -114,7 +97,7 @@ def test_pipeline_explicit_destination_credentials(
     os.environ["DESTINATION__MYDEST__CREDENTIALS__USERNAME"] = "UN"
     os.environ["DESTINATION__MYDEST__CREDENTIALS__PASSWORD"] = "PW"
     p = dlt.pipeline(
-        destination=dest_ref_func(
+        destination=Destination.from_reference(
             "postgres",
             destination_name="mydest",
             credentials="postgresql://localhost:5432/dlt_data",

tests/pipeline/test_pipeline_state.py

@@ -100,25 +100,11 @@ def test_state_repr() -> None:
     ]
 
 
-@pytest.mark.parametrize(
-    "use_factory_method",
-    [True, False],
-    ids=["use_factory_method", "use_from_reference"],
-)
-def test_restore_state_props(use_factory_method: bool) -> None:
-    """Test pipeline state persistence and restoration.
-
-    Args:
-        use_factory_method (bool): If True, uses `dlt.destination()` (which calls
-            `Destination.from_reference()` internally). If False, calls
-            `Destination.from_reference()` directly. Both should behave identically.
-    """
-    dest_ref_func = dlt.destination if use_factory_method else Destination.from_reference
-
+def test_restore_state_props() -> None:
     p = dlt.pipeline(
         pipeline_name="restore_state_props",
-        destination=dest_ref_func("redshift", destination_name="redshift_name"),
-        staging=dest_ref_func("filesystem", destination_name="filesystem_name"),
+        destination=Destination.from_reference("redshift", destination_name="redshift_name"),
+        staging=Destination.from_reference("filesystem", destination_name="filesystem_name"),
         dataset_name="the_dataset",
     )
     print(get_dlt_pipelines_dir())