Windows: Do not pause in .bat and fix executable name in test on Windows (#5624)

Author: echoix

.github/workflows/osgeo4w.yml

@@ -143,8 +143,7 @@ jobs:
           pytest ^
             @.github/workflows/pytest_args_ci.txt ^
             @.github/workflows/pytest_args_deselect.txt ^
-            @.github/workflows/pytest_args_gunittest.txt ^
-            --deselect=lib/init/testsuite/test_grass_tmp_mapset.py
+            @.github/workflows/pytest_args_gunittest.txt
         shell: cmd /D /E:ON /V:OFF /S /C "CALL C:/OSGeo4W/OSGeo4W.bat "{0}""
 
       - name: Run tests

.github/workflows/osgeo4w_gunittest.cfg

@@ -5,7 +5,6 @@
 # but it includes mainly tests which can (and should) be fixed.
 exclude =
     gui/wxpython/core/testsuite/toolboxes.sh
-    lib/init/testsuite/test_grass_tmp_mapset.py
     python/grass/gunittest/testsuite/test_gunitest_doctests.py
     python/grass/pygrass/raster/testsuite/test_pygrass_raster_doctests.py
     python/grass/pygrass/rpc/testsuite/test_pygrass_rpc_doctests.py

lib/init/grass.bat.in

@@ -22,8 +22,3 @@ set GRASS_PYTHON=@GRASS_PYTHON@
 set GRASS_CONFIG_DIR=@grass_config_dir@
 
 "@GRASS_PYTHON@" "@gisbase_init_dir@\etc\@START_UP@" %*
-
-rem
-rem Pause on error
-rem
-if %ERRORLEVEL% GEQ 1 pause

lib/init/testsuite/test_grass_tmp_mapset.py

@@ -18,7 +18,6 @@
 import os
 import shutil
 import subprocess
-from grass.gunittest.utils import xfail_windows
 
 
 # Note that unlike rest of GRASS GIS, here we are using unittest package
@@ -31,7 +30,9 @@ class TestTmpMapset(unittest.TestCase):
     """Tests --tmp-mapset option of grass command"""
 
     # TODO: here we need a name of or path to the main GRASS GIS executable
-    executable = "grass"
+    # TODO: support OSGeo4W executable with:
+    # executable = "grass" if os.name != "nt" else "grass85.bat"
+    executable = "grass" if os.name != "nt" else "grass.bat"
     # an arbitrary, but identifiable and fairly unique name
     location = "test_tmp_mapset_xy"
 
@@ -44,7 +45,6 @@ def tearDown(self):
         """Deletes the location"""
         shutil.rmtree(self.location, ignore_errors=True)
 
-    @xfail_windows
     def test_command_runs(self):
         """Check that correct parameters are accepted"""
         return_code = subprocess.call(
@@ -59,7 +59,6 @@ def test_command_runs(self):
             ),
         )
 
-    @xfail_windows
     def test_command_fails_without_location(self):
         """Check that the command fails with a nonexistent location"""
         return_code = subprocess.call(
@@ -81,7 +80,6 @@ def test_command_fails_without_location(self):
             ),
         )
 
-    @xfail_windows
     def test_mapset_metadata_correct(self):
         """Check that metadata is readable and have expected value (XY CRS)"""
         output = subprocess.check_output(
@@ -95,7 +93,6 @@ def test_mapset_metadata_correct(self):
             ),
         )
 
-    @xfail_windows
     def test_mapset_deleted(self):
         """Check that mapset is deleted at the end of execution"""
         subprocess.check_call(

mswindows/GRASS-Installer.nsi.tmpl

@@ -676,8 +676,6 @@ Section "GRASS" SecGRASS
 	FileWrite $0 'cd "%USERPROFILE%"'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 '"%GRASS_PYTHON%" "%GISBASE%\etc\grass@GRASS_VERSION_MAJOR@@[email protected]" %*'
-	FileWrite $0 '$\r$\n$\r$\n'
-	FileWrite $0 'if %ERRORLEVEL% GEQ 1 pause'
 	FileClose $0
 	done_create_grass_command.bat:
 

mswindows/crosscompile.sh

@@ -409,7 +409,6 @@ if not exist "%GISBASE%\etc\fontcap" (
 )
 
 "%GRASS_PYTHON%" "%GISBASE%\etc\grass$version.py" %*
-if %ERRORLEVEL% geq 1 pause
 EOT
 unix2dos $dist/grass.bat
 

mswindows/osgeo4w/grass.bat.tmpl

@@ -15,9 +15,4 @@ call "%OSGEO4W_ROOT%\apps\grass\grass@POSTFIX@\etc\env.bat"
 rem
 rem Launch GRASS GIS
 rem
-"%GRASS_PYTHON%" "%GISBASE%\etc\grass@[email protected]" %*
-
-rem
-rem Pause on error
-rem
-if %ERRORLEVEL% GEQ 1 pause
+"%GRASS_PYTHON%" "%GISBASE%\etc\grass@[email protected]" %*

mswindows/osgeo4w/python-grass.bat.tmpl

@@ -14,8 +14,3 @@ call "%OSGEO4W_ROOT%\apps\grass\grass@POSTFIX@\etc\env.bat"
 
 set PYTHONPATH=%OSGEO4W_ROOT%\apps\grass\grass@POSTFIX@\etc\python;%PYTHONPATH%
 "%GRASS_PYTHON%" %*
-
-rem
-rem Pause on error
-rem
-if %ERRORLEVEL% GEQ 1 pause