Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / test_tools_tiger_data.py

diff --git a/test/python/test_tools_tiger_data.py b/test/python/test_tools_tiger_data.py
index 6290b9944d071267e06a6228993c63f22d1b034d..5029a1320c9d36c5df426660a2e84e143c9d0024 100644 (file)
--- a/test/python/test_tools_tiger_data.py
+++ b/test/python/test_tools_tiger_data.py
@@ -10,15 +10,11 @@ from nominatim.tools import tiger_data, database_import
 
 
 @pytest.mark.parametrize("threads", (1, 5))
 
 
 @pytest.mark.parametrize("threads", (1, 5))

-def test_add_tiger_data(dsn, src_dir, def_config, monkeypatch,tmp_path,
+def test_add_tiger_data(dsn, src_dir, def_config, tmp_path, sql_preprocessor,

                         temp_db_cursor, threads, temp_db):
                         temp_db_cursor, threads, temp_db):

-    monkeypatch.setenv('NOMINATIM_DATABASE_MODULE_PATH', '.')

     temp_db_cursor.execute('CREATE EXTENSION hstore')
     temp_db_cursor.execute('CREATE EXTENSION postgis')
     temp_db_cursor.execute('CREATE TABLE place (id INT)')
     temp_db_cursor.execute('CREATE EXTENSION hstore')
     temp_db_cursor.execute('CREATE EXTENSION postgis')
     temp_db_cursor.execute('CREATE TABLE place (id INT)')

-
-    database_import.import_base_data('dbname=' + temp_db, src_dir / 'data',
-                                     ignore_partitions=False)

     sqlfile = tmp_path / '1010.sql'
     sqlfile.write_text("""INSERT INTO place values (1)""")
     tiger_data.add_tiger_data(dsn, str(tmp_path), threads, def_config, src_dir / 'lib-sql')
     sqlfile = tmp_path / '1010.sql'
     sqlfile.write_text("""INSERT INTO place values (1)""")
     tiger_data.add_tiger_data(dsn, str(tmp_path), threads, def_config, src_dir / 'lib-sql')


@@ -26,15 +22,11 @@ def test_add_tiger_data(dsn, src_dir, def_config, monkeypatch,tmp_path,
     assert temp_db_cursor.table_rows('place') == 1
 
 @pytest.mark.parametrize("threads", (1, 5))
     assert temp_db_cursor.table_rows('place') == 1
 
 @pytest.mark.parametrize("threads", (1, 5))

-def test_add_tiger_data_tarfile(dsn, src_dir, def_config, monkeypatch,tmp_path,
-                        temp_db_cursor, threads, temp_db):
-    monkeypatch.setenv('NOMINATIM_DATABASE_MODULE_PATH', '.')
+def test_add_tiger_data_tarfile(dsn, src_dir, def_config, tmp_path,
+                        temp_db_cursor, threads, temp_db, sql_preprocessor):

     temp_db_cursor.execute('CREATE EXTENSION hstore')
     temp_db_cursor.execute('CREATE EXTENSION postgis')
     temp_db_cursor.execute('CREATE TABLE place (id INT)')
     temp_db_cursor.execute('CREATE EXTENSION hstore')
     temp_db_cursor.execute('CREATE EXTENSION postgis')
     temp_db_cursor.execute('CREATE TABLE place (id INT)')

-
-    database_import.import_base_data('dbname=' + temp_db, src_dir / 'data',
-                                     ignore_partitions=False)

     sqlfile = tmp_path / '1010.sql'
     sqlfile.write_text("""INSERT INTO place values (1)""")
     tar = tarfile.open("sample.tar.gz", "w:gz")
     sqlfile = tmp_path / '1010.sql'
     sqlfile.write_text("""INSERT INTO place values (1)""")
     tar = tarfile.open("sample.tar.gz", "w:gz")