Skip to content

Commit 319dff8

Browse files
committed
remove HAVE_LUA config option from BDD tests
Lua is now mandatory.
1 parent d0b6f32 commit 319dff8

File tree

3 files changed

+0
-20
lines changed

3 files changed

+0
-20
lines changed

tests/bdd/environment.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
'KEEP_TEST_DB': False,
3939
'TEST_DB': 'osm2pgsql-test',
4040
'HAVE_TABLESPACE': True,
41-
'HAVE_LUA': True,
4241
'HAVE_PROJ': True
4342
}
4443

@@ -93,9 +92,6 @@ def before_all(context):
9392
if proc.returncode != 0:
9493
raise RuntimeError('Cannot run osm2pgsql')
9594

96-
if context.config.userdata['HAVE_LUA']:
97-
context.config.userdata['HAVE_LUA'] = 'Lua support not included' not in ver_info
98-
9995
if context.config.userdata['HAVE_PROJ']:
10096
context.config.userdata['HAVE_PROJ'] = 'Proj [disabled]' not in ver_info
10197

@@ -118,9 +114,6 @@ def before_scenario(context, scenario):
118114
if 'config.have_proj' in scenario.tags and not context.config.userdata['HAVE_PROJ']:
119115
scenario.skip("Generic proj library not configured.")
120116

121-
if 'config.have_lua' in scenario.tags and not context.config.userdata['HAVE_LUA']:
122-
scenario.skip("Lua support not compiled in.")
123-
124117
context.db = use_fixture(test_db, context)
125118
context.import_file = None
126119
context.import_data = {'n': [], 'w': [], 'r': []}

tests/bdd/regression/properties.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ Feature: Updates to the test database with properties check
9292
Using style file '' (same as on import).
9393
"""
9494

95-
@config.have_lua
9695
Scenario Outline: Create/append with various style parameters with flex output
9796
When running osm2pgsql flex with parameters
9897
| --slim |

tests/bdd/steps/steps_execute.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,30 +121,18 @@ def do_not_setup_tagtransform(context):
121121

122122
@given("the default lua tagtransform")
123123
def setup_lua_tagtransform(context):
124-
if not context.config.userdata['HAVE_LUA']:
125-
context.scenario.skip("Lua support not compiled in.")
126-
return
127-
128124
context.osm2pgsql_params.extend(('--tag-transform-script',
129125
str(context.default_data_dir / 'style.lua')))
130126

131127
@given("the lua style")
132128
def setup_inline_lua_style(context):
133-
if not context.config.userdata['HAVE_LUA']:
134-
context.scenario.skip("Lua support not compiled in.")
135-
return
136-
137129
outfile = context.workdir / 'inline_style.lua'
138130
outfile.write_text(context.text)
139131
context.osm2pgsql_params.extend(('-S', str(outfile)))
140132

141133

142134
@given("the style file '(?P<style>.+)'")
143135
def setup_style_file(context, style):
144-
if style.endswith('.lua') and not context.config.userdata['HAVE_LUA']:
145-
context.scenario.skip("Lua support not compiled in.")
146-
return
147-
148136
context.osm2pgsql_params.extend(('-S', str(context.test_data_dir / style)))
149137

150138

0 commit comments

Comments
 (0)