safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

test: rerun indexing after updates until really all is done

Browse Source 
There are caess where indexing needs to be done a second round
because related objects need to be updated.
This commit is contained in:
Sarah Hoffmann
2017-03-11 17:09:14 +01:00
parent 6153ad3b31
commit 1aaeee19a1
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/bdd/steps/db_ops.py
View File

@@ -243,7 +243,14 @@ def update_place_table(context):
col.db_insert(cur)
context.db.commit()
context.nominatim.run_update_script('index')
while True:
context.nominatim.run_update_script('index')
cur = context.db.cursor()
cur.execute("SELECT 'a' FROM placex WHERE indexed_status != 0 LIMIT 1")
if cur.rowcount == 0:
break
@when("marking for delete (?P<oids>.*)")
def delete_places(context, oids):
@@ -254,7 +261,14 @@ def delete_places(context, oids):
where, params = NominatimID(oid).table_select()
cur.execute("DELETE FROM place WHERE " + where, params)
context.db.commit()
context.nominatim.run_update_script('index')
while True:
context.nominatim.run_update_script('index')
cur = context.db.cursor()
cur.execute("SELECT 'a' FROM placex WHERE indexed_status != 0 LIMIT 1")
if cur.rowcount == 0:
break
@then("placex contains(?P<exact> exactly)?")
def check_placex_contents(context, exact):