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 97f9055b0c3a5a5cb87d5685f8e891cb720fc5ed..194299995e08cd13ec3960e56bfe862b37d494bb 100644 (file)
--- 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 f8a6d3cdce530610a79ff84c292db495e0282848..3858198b680112017d785c522a62ca4f1b6c2243 100644 (file)
--- 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):
     """