Skip to content

Commit 8ee00ec

Browse files
Fix catalog in e2e sqlite test
1 parent 00798e0 commit 8ee00ec

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

tests/samples/conftest.py

+13-7
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,7 @@ def _sqlite_sample_db(sqlite_connector):
3434

3535

3636
@pytest.fixture
37-
def sqlite_sample_tap(
38-
_sqlite_sample_db,
39-
sqlite_sample_db_config,
40-
sqlite_sample_db_state,
41-
) -> SQLiteTap:
42-
_ = _sqlite_sample_db
37+
def sqlite_sample_db_catalog(sqlite_sample_db_config) -> Catalog:
4338
catalog_obj = Catalog.from_dict(
4439
_get_tap_catalog(SQLiteTap, config=sqlite_sample_db_config, select_all=True),
4540
)
@@ -55,9 +50,20 @@ def sqlite_sample_tap(
5550
t2.key_properties = ["c1"]
5651
t2.replication_key = "c1"
5752
t2.replication_method = "INCREMENTAL"
53+
return catalog_obj
54+
55+
56+
@pytest.fixture
57+
def sqlite_sample_tap(
58+
_sqlite_sample_db,
59+
sqlite_sample_db_config,
60+
sqlite_sample_db_state,
61+
sqlite_sample_db_catalog,
62+
) -> SQLiteTap:
63+
_ = _sqlite_sample_db
5864
return SQLiteTap(
5965
config=sqlite_sample_db_config,
60-
catalog=catalog_obj.to_dict(),
66+
catalog=sqlite_sample_db_catalog.to_dict(),
6167
state=sqlite_sample_db_state,
6268
)
6369

tests/samples/test_target_sqlite.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
from samples.sample_target_sqlite import SQLiteSink, SQLiteTarget
2020
from singer_sdk import typing as th
2121
from singer_sdk.testing import (
22-
_get_tap_catalog,
2322
tap_sync_test,
2423
tap_to_target_sync_test,
2524
target_sync_test,
2625
)
2726

2827
if t.TYPE_CHECKING:
28+
from singer_sdk._singerlib import Catalog
2929
from singer_sdk.tap_base import SQLTap
3030
from singer_sdk.target_base import SQLTarget
3131

@@ -67,6 +67,7 @@ def sqlite_sample_target_batch(sqlite_target_test_config):
6767
def test_sync_sqlite_to_sqlite(
6868
sqlite_sample_tap: SQLTap,
6969
sqlite_sample_target: SQLTarget,
70+
sqlite_sample_db_catalog: Catalog,
7071
):
7172
"""End-to-end-to-end test for SQLite tap and target.
7273
@@ -84,8 +85,10 @@ def test_sync_sqlite_to_sqlite(
8485
)
8586
orig_stdout.seek(0)
8687
tapped_config = dict(sqlite_sample_target.config)
87-
catalog = _get_tap_catalog(SQLiteTap, config=tapped_config, select_all=True)
88-
tapped_target = SQLiteTap(config=tapped_config, catalog=catalog)
88+
tapped_target = SQLiteTap(
89+
config=tapped_config,
90+
catalog=sqlite_sample_db_catalog.to_dict(),
91+
)
8992
new_stdout, _ = tap_sync_test(tapped_target)
9093

9194
orig_stdout.seek(0)

0 commit comments

Comments
 (0)