run osm2pgsql-replication in BDD tests as a module

This gives us the possibility to monkeypatch parts of the code.

Author: lonvia

scripts/osm2pgsql-replication

@@ -656,9 +656,12 @@ def get_parser():
     return parser
 
 
-def main():
+def main(prog_args=None):
     parser = get_parser()
-    args = parser.parse_args()
+    try:
+        args = parser.parse_args(args=prog_args)
+    except SystemExit:
+        return 1
 
     if missing_modules:
         LOG.fatal("Missing required Python libraries %(mods)s.\n\n"

tests/bdd/environment.py

@@ -8,6 +8,8 @@
 from pathlib import Path
 import subprocess
 import tempfile
+import importlib.util
+from importlib.machinery import SourceFileLoader
 
 from behave import *
 import psycopg2
@@ -89,6 +91,14 @@ def before_all(context):
     context.test_data_dir = Path(context.config.userdata['TEST_DATA_DIR']).resolve()
     context.default_data_dir = Path(context.config.userdata['SRC_DIR']).resolve()
 
+    # Set up replication script.
+    replicationfile = str(Path(context.config.userdata['REPLICATION_SCRIPT']).resolve())
+    spec = importlib.util.spec_from_loader('osm2pgsql_replication',
+                                           SourceFileLoader( 'osm2pgsql_replication',replicationfile))
+    assert spec, f"File not found: {replicationfile}"
+    context.osm2pgsql_replication = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(context.osm2pgsql_replication)
+
 
 def before_scenario(context, scenario):
     """ Set up a fresh, empty test database.

tests/bdd/steps/steps_execute.py

@@ -9,8 +9,10 @@
 """
 from io import StringIO
 from pathlib import Path
-import os
+import sys
 import subprocess
+import contextlib
+import logging
 
 def get_import_file(context):
     if context.import_file is not None:
@@ -76,7 +78,7 @@ def run_osm2pgsql(context, output):
 
 
 def run_osm2pgsql_replication(context):
-    cmdline = [str(Path(context.config.userdata['REPLICATION_SCRIPT']).resolve())]
+    cmdline = []
     # convert table items to CLI arguments and inject constants to placeholders
     if context.table:
         cmdline.extend(f.format(**context.config.userdata) for f in context.table.headings if f)
@@ -86,19 +88,18 @@ def run_osm2pgsql_replication(context):
     if '-d' not in cmdline and '--database' not in cmdline:
         cmdline.extend(('-d', context.config.userdata['TEST_DB']))
 
-    # on Windows execute script directly with python, because shebang is not recognised
-    if os.name == 'nt':
-        cmdline.insert(0, "python")
 
-    proc = subprocess.Popen(cmdline, cwd=str(context.workdir),
-                            stdin=subprocess.PIPE,
-                            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    serr = StringIO()
+    log_handler = logging.StreamHandler(serr)
+    context.osm2pgsql_replication.LOG.addHandler(log_handler)
+    with contextlib.redirect_stdout(StringIO()) as sout:
+        retval = context.osm2pgsql_replication.main(cmdline)
+    context.osm2pgsql_replication.LOG.removeHandler(log_handler)
 
-    outdata = proc.communicate()
+    context.osm2pgsql_outdata = [sout.getvalue(), serr.getvalue()]
+    print(context.osm2pgsql_outdata)
 
-    context.osm2pgsql_outdata = [d.decode('utf-8').replace('\\n', '\n') for d in outdata]
-
-    return proc.returncode
+    return retval
 
 
 @given("no lua tagtransform")