add sanic development server implementation

[nominatim.git] / test / python / cli / test_cli.py

diff --git a/test/python/cli/test_cli.py b/test/python/cli/test_cli.py
index e8e185049a15ba46f5672f4c397e83845d15e615..1072f6c934195b9b1332497619fa24172f100396 100644 (file)
--- a/test/python/cli/test_cli.py
+++ b/test/python/cli/test_cli.py
@@ -29,7 +29,7 @@ def test_cli_help(cli_call, capsys):
 def test_cli_version(cli_call, capsys):
     """ Running nominatim tool --version prints a version string.
     """
 def test_cli_version(cli_call, capsys):
     """ Running nominatim tool --version prints a version string.
     """

-    assert cli_call('--version') == 1
+    assert cli_call('--version') == 0

 
     captured = capsys.readouterr()
     assert captured.out.startswith('Nominatim version')
 
     captured = capsys.readouterr()
     assert captured.out.startswith('Nominatim version')


@@ -82,19 +82,17 @@ def test_cli_export_command(cli_call, mock_run_legacy):
                                          ('restrict-to-osm-way', '727'),
                                          ('restrict-to-osm-relation', '197532')
                                         ])
                                          ('restrict-to-osm-way', '727'),
                                          ('restrict-to-osm-relation', '197532')
                                         ])

-def test_export_parameters(src_dir, tmp_path, param, value):
+def test_export_parameters(src_dir, tmp_path, param, value, monkeypatch):

     (tmp_path / 'admin').mkdir()
     (tmp_path / 'admin' / 'export.php').write_text(f"""<?php
         exit(strpos(implode(' ', $_SERVER['argv']), '--{param} {value}') >= 0 ? 0 : 10);
         """)
 
     (tmp_path / 'admin').mkdir()
     (tmp_path / 'admin' / 'export.php').write_text(f"""<?php
         exit(strpos(implode(' ', $_SERVER['argv']), '--{param} {value}') >= 0 ? 0 : 10);
         """)
 

+    monkeypatch.setattr(nominatim.paths, 'PHPLIB_DIR', tmp_path)
+

     assert nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE',
                                    osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
     assert nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE',
                                    osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',

-                                   phplib_dir=str(tmp_path),
-                                   data_dir=str(src_dir / 'data'),

                                    phpcgi_path='/usr/bin/php-cgi',
                                    phpcgi_path='/usr/bin/php-cgi',

-                                   sqllib_dir=str(src_dir / 'lib-sql'),
-                                   config_dir=str(src_dir / 'settings'),

                                    cli_args=['export', '--' + param, value]) == 0
 
 
                                    cli_args=['export', '--' + param, value]) == 0