From bdbbdefd117b7ab5d6d3d97e89d0bb18d6ee17fd Mon Sep 17 00:00:00 2001 From: Ryan Lambert Date: Tue, 6 Aug 2024 09:27:53 -0600 Subject: [PATCH] fix tests --- docker/tests/test_geofabrik.py | 8 ++++---- docker/tests/test_pgosm_flex.py | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docker/tests/test_geofabrik.py b/docker/tests/test_geofabrik.py index 3182955..54234e8 100644 --- a/docker/tests/test_geofabrik.py +++ b/docker/tests/test_geofabrik.py @@ -22,8 +22,8 @@ def setUp(self): pgosm_date=PGOSM_DATE, layerset=LAYERSET, layerset_path=None, - replication=False, - schema_name='osm') + schema_name='osm', + skip_nested=True) def tearDown(self): @@ -44,8 +44,8 @@ def test_get_region_filename_returns_region_when_subregion_None(self): pgosm_date=PGOSM_DATE, layerset=LAYERSET, layerset_path=None, - replication=False, - schema_name='osm') + schema_name='osm', + skip_nested=True) result = geofabrik.get_region_filename() expected = f'{REGION_US}-latest.osm.pbf' diff --git a/docker/tests/test_pgosm_flex.py b/docker/tests/test_pgosm_flex.py index 1d7670f..ed190a0 100644 --- a/docker/tests/test_pgosm_flex.py +++ b/docker/tests/test_pgosm_flex.py @@ -19,8 +19,8 @@ def setUp(self): pgosm_date=PGOSM_DATE, layerset=LAYERSET, layerset_path=None, - replication=False, - schema_name='osm') + schema_name='osm', + skip_nested=True) def tearDown(self): @@ -91,8 +91,8 @@ def test_get_export_filename_region_only(self): pgosm_date=PGOSM_DATE, layerset=LAYERSET, layerset_path=None, - replication=False, - schema_name='osm') + schema_name='osm', + skip_nested=True) input_file = None result = pgosm_flex.get_export_filename(input_file) @@ -109,8 +109,8 @@ def test_layerset_include_place_returns_boolean(self): pgosm_date=PGOSM_DATE, layerset=LAYERSET, layerset_path=layerset_path, - replication=False, - schema_name='osm') + schema_name='osm', + skip_nested=True) paths = pgosm_flex.get_paths() result = pgosm_flex.layerset_include_place(flex_path=paths['flex_path']) @@ -128,8 +128,8 @@ def test_layerset_include_place_returns_True_with_default_layerset(self): pgosm_date=PGOSM_DATE, layerset=LAYERSET, layerset_path=layerset_path, - replication=False, - schema_name='osm') + schema_name='osm', + skip_nested=True) paths = pgosm_flex.get_paths() actual = pgosm_flex.layerset_include_place(flex_path=paths['flex_path']) @@ -147,8 +147,8 @@ def test_layerset_include_place_returns_false_when_place_false_in_ini(self): pgosm_date=PGOSM_DATE, layerset=layerset, layerset_path=layerset_path, - replication=False, - schema_name='osm') + schema_name='osm', + skip_nested=True) paths = pgosm_flex.get_paths() actual = pgosm_flex.layerset_include_place(flex_path=paths['flex_path']) @@ -166,8 +166,8 @@ def test_layerset_include_place_returns_false_when_place_missing_in_ini(self): pgosm_date=PGOSM_DATE, layerset=layerset, layerset_path=layerset_path, - replication=False, - schema_name='osm') + schema_name='osm', + skip_nested=True) paths = pgosm_flex.get_paths() actual = pgosm_flex.layerset_include_place(flex_path=paths['flex_path']) @@ -185,8 +185,8 @@ def test_layerset_include_place_returns_true_when_place_true_in_ini(self): pgosm_date=PGOSM_DATE, layerset=layerset, layerset_path=layerset_path, - replication=False, - schema_name='osm') + schema_name='osm', + skip_nested=True) paths = pgosm_flex.get_paths() actual = pgosm_flex.layerset_include_place(flex_path=paths['flex_path'])