From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 5 Jan 2021 10:26:39 +0000 (+0100)
Subject: bdd: move scene setup to OSM data steps
X-Git-Tag: v3.7.0~59^2~5
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b8e39d2dde4ffc0d202fc60af920b54b054601d7?ds=inline

bdd: move scene setup to OSM data steps

The step has nothing to do with the database.
---

diff --git a/test/bdd/steps/steps_db_ops.py b/test/bdd/steps/steps_db_ops.py
index 97f9055b..19429999 100644
--- a/test/bdd/steps/steps_db_ops.py
+++ b/test/bdd/steps/steps_db_ops.py
@@ -220,10 +220,6 @@ def assert_db_column(row, column, value, context):
 
 ################################ GIVEN ##################################
 
-@given(u'the scene (?P<scene>.+)')
-def set_default_scene(context, scene):
-    context.scene = scene
-
 @given("the (?P<named>named )?places")
 def add_data_to_place_table(context, named):
     with context.db.cursor() as cur:
diff --git a/test/bdd/steps/steps_osm_data.py b/test/bdd/steps/steps_osm_data.py
index f8a6d3cd..3858198b 100644
--- a/test/bdd/steps/steps_osm_data.py
+++ b/test/bdd/steps/steps_osm_data.py
@@ -22,6 +22,10 @@ def write_opl_file(opl, grid):
 
         return fd.name
 
+@given(u'the scene (?P<scene>.+)')
+def set_default_scene(context, scene):
+    context.scene = scene
+
 @given(u'the ([0-9.]+ )?grid')
 def define_node_grid(context, grid_step):
     """