msautotest: add mspython in subdirectories explored by pytest, and sk…

…ip properly mspython tests if mapscript not available

msautotest/gdal/run_test.py

@@ -45,5 +45,4 @@ def test(map, out_file, command, extra_args):
 # main()
 
 if __name__ == '__main__':
-    sys.argv[0] = 'run_test.py'
-    sys.exit(pytest.main())
+    sys.exit(mstestlib.pytest_main())

msautotest/misc/run_test.py

@@ -45,5 +45,4 @@ def test(map, out_file, command, extra_args):
 # main()
 
 if __name__ == '__main__':
-    sys.argv[0] = 'run_test.py'
-    sys.exit(pytest.main())
+    sys.exit(mstestlib.pytest_main())

msautotest/mspython/test_bug_check.py

@@ -35,8 +35,14 @@
 
 import pmstestlib
 
-import mapscript
-
+mapscript_available = False
+try:
+    import mapscript
+    mapscript_available = True
+except ImportError:
+    pass
+
+pytestmark = pytest.mark.skipif(not mapscript_available, reason="mapscript not available")
 
 def get_relpath_to_this(filename):
     return os.path.join(os.path.dirname(__file__), filename)

msautotest/mspython/test_mapio.py

@@ -31,7 +31,15 @@
 
 import os
 import pytest
-import mapscript
+
+mapscript_available = False
+try:
+    import mapscript
+    mapscript_available = True
+except ImportError:
+    pass
+
+pytestmark = pytest.mark.skipif(not mapscript_available, reason="mapscript not available")
 
 
 def get_relpath_to_this(filename):

msautotest/mspython/test_ogr_query.py

@@ -36,7 +36,14 @@
 
 import pmstestlib
 
-import mapscript
+mapscript_available = False
+try:
+    import mapscript
+    mapscript_available = True
+except ImportError:
+    pass
+
+pytestmark = pytest.mark.skipif(not mapscript_available, reason="mapscript not available")
 
 ###############################################################################
 # Dump query result set ... used when debugging this test script.

msautotest/mspython/test_rq.py

@@ -34,8 +34,16 @@
 import math
 
 import pmstestlib
+import pytest
 
-import mapscript
+mapscript_available = False
+try:
+    import mapscript
+    mapscript_available = True
+except ImportError:
+    pass
+
+pytestmark = pytest.mark.skipif(not mapscript_available, reason="mapscript not available")
 
 ###############################################################################
 # Dump query result set ... used when debugging this test script.

msautotest/mspython/test_wkt.py

@@ -37,7 +37,14 @@
 
 import pytest
 
-import mapscript
+mapscript_available = False
+try:
+    import mapscript
+    mapscript_available = True
+except ImportError:
+    pass
+
+pytestmark = pytest.mark.skipif(not mapscript_available, reason="mapscript not available")
 
 ###############################################################################
 # Test simple geometries that should convert back to same thing - OGR only.

msautotest/mspython/test_xmp.py

@@ -32,7 +32,14 @@
 import os
 import pytest
 
-import mapscript
+mapscript_available = False
+try:
+    import mapscript
+    mapscript_available = True
+except ImportError:
+    pass
+
+pytestmark = pytest.mark.skipif(not mapscript_available, reason="mapscript not available")
 
 
 def get_relpath_to_this(filename):

msautotest/pymod/mstestlib.py

@@ -726,3 +726,26 @@ def run_pytest(map, out_file, command, extra_args):
 
     ret, msg = _run(map, out_file, command, extra_args)
     assert ret, msg
+
+###############################################################################
+
+
+def pytest_main():
+    maps = []
+    new_argv = []
+    help = False
+    for arg in sys.argv:
+        if arg.endswith('.map'):
+            maps.append(arg[0:-4])
+        else:
+            if arg == '--help':
+                help = True
+            new_argv.append(arg)
+    sys.argv = new_argv
+    if maps:
+        sys.argv.append('-k')
+        sys.argv.append(' or '.join(maps))
+    ret = pytest.main()
+    if help:
+        print('\nMapServer note: you can also specify one or several .map filenames')
+    return ret

msautotest/pytest.ini

@@ -1,4 +1,4 @@
 [pytest]
 python_files = *.py
-testpaths = misc gdal query renderers wxs sld
+testpaths = misc gdal query renderers wxs sld mspython
 

msautotest/query/run_test.py

@@ -45,5 +45,4 @@ def test(map, out_file, command, extra_args):
 # main()
 
 if __name__ == '__main__':
-    sys.argv[0] = 'run_test.py'
-    sys.exit(pytest.main())
+    sys.exit(mstestlib.pytest_main())

msautotest/renderers/run_test.py

@@ -45,5 +45,4 @@ def test(map, out_file, command, extra_args):
 # main()
 
 if __name__ == '__main__':
-    sys.argv[0] = 'run_test.py'
-    sys.exit(pytest.main())
+    sys.exit(mstestlib.pytest_main())

msautotest/sld/run_test.py

@@ -45,5 +45,4 @@ def test(map, out_file, command, extra_args):
 # main()
 
 if __name__ == '__main__':
-    sys.argv[0] = 'run_test.py'
-    sys.exit(pytest.main())
+    sys.exit(mstestlib.pytest_main())

msautotest/wxs/run_test.py

@@ -45,5 +45,4 @@ def test(map, out_file, command, extra_args):
 # main()
 
 if __name__ == '__main__':
-    sys.argv[0] = 'run_test.py'
-    sys.exit(pytest.main())
+    sys.exit(mstestlib.pytest_main())