simplify weigh_search() function

[nominatim.git] / test / python / tools / test_replication.py

diff --git a/test/python/tools/test_replication.py b/test/python/tools/test_replication.py
index 2f9c7e866b75da75becfda701f7c0dbb50fff265..7a7340ae41125f52bf7857ec24d06d3a6e50a4dc 100644 (file)
--- a/test/python/tools/test_replication.py
+++ b/test/python/tools/test_replication.py
@@ -100,19 +100,19 @@ def update_options(tmpdir):
                 import_file=tmpdir / 'foo.osm',
                 max_diff_size=1)
 
                 import_file=tmpdir / 'foo.osm',
                 max_diff_size=1)
 

-def test_update_empty_status_table(temp_db_conn):
+def test_update_empty_status_table(dsn):

     with pytest.raises(UsageError):
     with pytest.raises(UsageError):

-        nominatim.tools.replication.update(temp_db_conn, {})
+        nominatim.tools.replication.update(dsn, {})

 
 
 
 

-def test_update_already_indexed(temp_db_conn):
+def test_update_already_indexed(temp_db_conn, dsn):

     status.set_status(temp_db_conn, dt.datetime.now(dt.timezone.utc), seq=34, indexed=False)
 
     status.set_status(temp_db_conn, dt.datetime.now(dt.timezone.utc), seq=34, indexed=False)
 

-    assert nominatim.tools.replication.update(temp_db_conn, dict(indexed_only=True)) \
+    assert nominatim.tools.replication.update(dsn, dict(indexed_only=True)) \

              == nominatim.tools.replication.UpdateState.MORE_PENDING
 
 
              == nominatim.tools.replication.UpdateState.MORE_PENDING
 
 

-def test_update_no_data_no_sleep(monkeypatch, temp_db_conn, update_options):
+def test_update_no_data_no_sleep(monkeypatch, temp_db_conn, dsn, update_options):

     date = dt.datetime.now(dt.timezone.utc) - dt.timedelta(days=1)
     status.set_status(temp_db_conn, date, seq=34)
 
     date = dt.datetime.now(dt.timezone.utc) - dt.timedelta(days=1)
     status.set_status(temp_db_conn, date, seq=34)
 


@@ -123,13 +123,13 @@ def test_update_no_data_no_sleep(monkeypatch, temp_db_conn, update_options):
     sleeptime = []
     monkeypatch.setattr(time, 'sleep', sleeptime.append)
 
     sleeptime = []
     monkeypatch.setattr(time, 'sleep', sleeptime.append)
 

-    assert nominatim.tools.replication.update(temp_db_conn, update_options) \
+    assert nominatim.tools.replication.update(dsn, update_options) \

              == nominatim.tools.replication.UpdateState.NO_CHANGES
 
     assert not sleeptime
 
 
              == nominatim.tools.replication.UpdateState.NO_CHANGES
 
     assert not sleeptime
 
 

-def test_update_no_data_sleep(monkeypatch, temp_db_conn, update_options):
+def test_update_no_data_sleep(monkeypatch, temp_db_conn, dsn, update_options):

     date = dt.datetime.now(dt.timezone.utc) - dt.timedelta(minutes=30)
     status.set_status(temp_db_conn, date, seq=34)
 
     date = dt.datetime.now(dt.timezone.utc) - dt.timedelta(minutes=30)
     status.set_status(temp_db_conn, date, seq=34)
 


@@ -140,7 +140,7 @@ def test_update_no_data_sleep(monkeypatch, temp_db_conn, update_options):
     sleeptime = []
     monkeypatch.setattr(time, 'sleep', sleeptime.append)
 
     sleeptime = []
     monkeypatch.setattr(time, 'sleep', sleeptime.append)
 

-    assert nominatim.tools.replication.update(temp_db_conn, update_options) \
+    assert nominatim.tools.replication.update(dsn, update_options) \

              == nominatim.tools.replication.UpdateState.NO_CHANGES
 
     assert len(sleeptime) == 1
              == nominatim.tools.replication.UpdateState.NO_CHANGES
 
     assert len(sleeptime) == 1