X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/830e3be1e61b8bac9452b65bcaa0d9feca166e03..a33f2c0f5ba43df533b6e137f9151fe67feb20a1:/test/python/test_tools_tiger_data.py?ds=inline

diff --git a/test/python/test_tools_tiger_data.py b/test/python/test_tools_tiger_data.py
index 1366fe3e..1ed89782 100644
--- a/test/python/test_tools_tiger_data.py
+++ b/test/python/test_tools_tiger_data.py
@@ -10,57 +10,52 @@ from nominatim.tools import tiger_data, database_import
 
 
 @pytest.mark.parametrize("threads", (1, 5))
-def test_add_tiger_data(dsn, src_dir, def_config, tmp_path, sql_preprocessor,
-                        temp_db_cursor, threads, temp_db):
-    temp_db_cursor.execute('CREATE EXTENSION hstore')
-    temp_db_cursor.execute('CREATE EXTENSION postgis')
+def test_add_tiger_data(def_config, tmp_path, sql_preprocessor,
+                        temp_db_cursor, threads, temp_db_with_extensions):
     temp_db_cursor.execute('CREATE TABLE place (id INT)')
     sqlfile = tmp_path / '1010.sql'
     sqlfile.write_text("""INSERT INTO place values (1);
                           INSERT INTO non_existant_table values (1);""")
-    tiger_data.add_tiger_data(dsn, str(tmp_path), threads, def_config, src_dir / 'lib-sql')
+    tiger_data.add_tiger_data(str(tmp_path), def_config, threads)
 
     assert temp_db_cursor.table_rows('place') == 1
 
+
 @pytest.mark.parametrize("threads", (1, 5))
-def test_add_tiger_data_bad_file(dsn, src_dir, def_config, tmp_path, sql_preprocessor,
-                        temp_db_cursor, threads, temp_db):
-    temp_db_cursor.execute('CREATE EXTENSION hstore')
-    temp_db_cursor.execute('CREATE EXTENSION postgis')
+def test_add_tiger_data_bad_file(def_config, tmp_path, sql_preprocessor,
+                                 temp_db_cursor, threads, temp_db_with_extensions):
     temp_db_cursor.execute('CREATE TABLE place (id INT)')
     sqlfile = tmp_path / '1010.txt'
     sqlfile.write_text("""Random text""")
-    tiger_data.add_tiger_data(dsn, str(tmp_path), threads, def_config, src_dir / 'lib-sql')
+    tiger_data.add_tiger_data(str(tmp_path), def_config, threads)
 
     assert temp_db_cursor.table_rows('place') == 0
 
+
 @pytest.mark.parametrize("threads", (1, 5))
-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')
+def test_add_tiger_data_tarfile(def_config, tmp_path, temp_db_cursor,
+                                threads, temp_db_with_extensions, sql_preprocessor):
     temp_db_cursor.execute('CREATE TABLE place (id INT)')
     sqlfile = tmp_path / '1010.sql'
     sqlfile.write_text("""INSERT INTO place values (1);
                           INSERT INTO non_existant_table values (1);""")
-    tar = tarfile.open("sample.tar.gz", "w:gz")
+    tar = tarfile.open(str(tmp_path / 'sample.tar.gz'), "w:gz")
     tar.add(sqlfile)
     tar.close()
-    tiger_data.add_tiger_data(dsn, str(src_dir / 'sample.tar.gz'), threads, def_config, src_dir / 'lib-sql')
-    
+    tiger_data.add_tiger_data(str(tmp_path / 'sample.tar.gz'), def_config, threads)
+
     assert temp_db_cursor.table_rows('place') == 1
 
+
 @pytest.mark.parametrize("threads", (1, 5))
-def test_add_tiger_data_bad_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')
+def test_add_tiger_data_bad_tarfile(def_config, tmp_path, temp_db_cursor, threads,
+                                    temp_db_with_extensions, sql_preprocessor):
     temp_db_cursor.execute('CREATE TABLE place (id INT)')
     sqlfile = tmp_path / '1010.txt'
     sqlfile.write_text("""Random text""")
-    tar = tarfile.open("sample.tar.gz", "w:gz")
+    tar = tarfile.open(str(tmp_path / 'sample.tar.gz'), "w:gz")
     tar.add(sqlfile)
     tar.close()
-    tiger_data.add_tiger_data(dsn, str(src_dir / 'sample.tar.gz'), threads, def_config, src_dir / 'lib-sql')
-    
-    assert temp_db_cursor.table_rows('place') == 0
\ No newline at end of file
+    tiger_data.add_tiger_data(str(tmp_path / 'sample.tar.gz'), def_config, threads)
+
+    assert temp_db_cursor.table_rows('place') == 0