CI: Address Windows specific issues in testsuite

gui/wxpython/core/testsuite/toolboxes.sh

@@ -3,5 +3,5 @@
 # run make in gui/wxpython before the test
 # run test using sh -e
 
-python $GISBASE/gui/wxpython/core/toolboxes.py doctest
-python $GISBASE/gui/wxpython/core/toolboxes.py test
+python3 $GISBASE/gui/wxpython/core/toolboxes.py doctest
+python3 $GISBASE/gui/wxpython/core/toolboxes.py test

gui/wxpython/core/toolboxes.py

@@ -27,11 +27,6 @@
 else:
     ETREE_EXCEPTIONS = expat.ExpatError
 
-if sys.version_info[0:2] > (2, 6):
-    has_xpath = True
-else:
-    has_xpath = False
-
 import grass.script.task as gtask
 import grass.script.core as gcore
 from grass.script.utils import try_remove, decode
@@ -430,18 +425,7 @@ def _expandToolboxes(node, toolboxes):
             items = n.find("./items")
             idx = list(items).index(subtoolbox)
 
-            if has_xpath:
-                toolbox = toolboxes.find(
-                    './/toolbox[@name="%s"]' % subtoolbox.get("name")
-                )
-            else:
-                toolbox = None
-                potentialToolboxes = toolboxes.findall(".//toolbox")
-                sName = subtoolbox.get("name")
-                for pToolbox in potentialToolboxes:
-                    if pToolbox.get("name") == sName:
-                        toolbox = pToolbox
-                        break
+            toolbox = toolboxes.find('.//toolbox[@name="%s"]' % subtoolbox.get("name"))
 
             if toolbox is None:  # not in file
                 continue
@@ -576,15 +560,7 @@ def _expandItems(node, items, itemTag):
     """
     for moduleItem in node.findall(".//" + itemTag):
         itemName = moduleItem.get("name")
-        if has_xpath:
-            moduleNode = items.find('.//%s[@name="%s"]' % (itemTag, itemName))
-        else:
-            moduleNode = None
-            potentialModuleNodes = items.findall(".//%s" % itemTag)
-            for mNode in potentialModuleNodes:
-                if mNode.get("name") == itemName:
-                    moduleNode = mNode
-                    break
+        moduleNode = items.find('.//%s[@name="%s"]' % (itemTag, itemName))
 
         if moduleNode is None:  # module not available in dist
             continue
@@ -789,9 +765,9 @@ def new_translator(string):
     sys.displayhook = new_displayhook
     sys.__displayhook__ = new_displayhook
 
-    import __builtin__
+    import builtins as _builtins
 
-    __builtin__._ = new_translator
+    _builtins.__dict__["_"] = new_translator
 
 
 def doc_test():

lib/gis/testsuite/test_parser_json.py

@@ -8,10 +8,12 @@
 @author Soeren Gebbert
 """
 
+import json
 import subprocess
+import sys
+
 from grass.gunittest.case import TestCase
 from grass.script import decode
-import json
 
 
 class TestParserJson(TestCase):
@@ -50,7 +52,9 @@ def test_r_slope_aspect_json(self):
             },
         ]
 
-        stdout, stderr = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()
+        stdout, stderr = subprocess.Popen(
+            args, stdout=subprocess.PIPE, shell=sys.platform == "win32"
+        ).communicate()
         print(stdout)
         json_code = json.loads(decode(stdout))
         self.assertEqual(json_code["module"], "r.slope.aspect")
@@ -83,7 +87,9 @@ def test_v_out_ascii(self):
             }
         ]
 
-        stdout, stderr = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()
+        stdout, stderr = subprocess.Popen(
+            args, stdout=subprocess.PIPE, shell=sys.platform == "win32"
+        ).communicate()
         print(stdout)
         json_code = json.loads(decode(stdout))
         self.assertEqual(json_code["module"], "v.out.ascii")
@@ -99,7 +105,9 @@ def test_v_info(self):
             {"param": "layer", "value": "1"},
         ]
 
-        stdout, stderr = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()
+        stdout, stderr = subprocess.Popen(
+            args, stdout=subprocess.PIPE, shell=sys.platform == "win32"
+        ).communicate()
         print(stdout)
         json_code = json.loads(decode(stdout))
         self.assertEqual(json_code["module"], "v.info")

lib/init/testsuite/test_grass_tmp_mapset.py

@@ -18,7 +18,7 @@
 import os
 import shutil
 import subprocess
-
+import sys
 
 # Note that unlike rest of GRASS GIS, here we are using unittest package
 # directly. The grass.gunittest machinery for mapsets is not needed here.
@@ -30,13 +30,16 @@ 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"
+    executable = shutil.which("grass")
     # an arbitrary, but identifiable and fairly unique name
     location = "test_tmp_mapset_xy"
 
     def setUp(self):
         """Creates a location used in the tests"""
-        subprocess.check_call([self.executable, "-c", "XY", self.location, "-e"])
+        subprocess.check_call(
+            [self.executable, "-c", "XY", self.location, "-e"],
+            shell=sys.platform == "win32",
+        )
         self.subdirs = os.listdir(self.location)
 
     def tearDown(self):
@@ -46,7 +49,8 @@ def tearDown(self):
     def test_command_runs(self):
         """Check that correct parameters are accepted"""
         return_code = subprocess.call(
-            [self.executable, "--tmp-mapset", self.location, "--exec", "g.proj", "-g"]
+            [self.executable, "--tmp-mapset", self.location, "--exec", "g.proj", "-g"],
+            shell=sys.platform == "win32",
         )
         self.assertEqual(
             return_code,
@@ -67,7 +71,8 @@ def test_command_fails_without_location(self):
                 "--exec",
                 "g.proj",
                 "-g",
-            ]
+            ],
+            shell=sys.platform == "win32",
         )
         self.assertNotEqual(
             return_code,
@@ -81,7 +86,8 @@ def test_command_fails_without_location(self):
     def test_mapset_metadata_correct(self):
         """Check that metadata is readable and have expected value (XY CRS)"""
         output = subprocess.check_output(
-            [self.executable, "--tmp-mapset", self.location, "--exec", "g.proj", "-g"]
+            [self.executable, "--tmp-mapset", self.location, "--exec", "g.proj", "-g"],
+            shell=sys.platform == "win32",
         )
         self.assertEqual(
             output.strip(),

python/grass/grassdb/testsuite/test_manage.py

@@ -12,6 +12,8 @@
 
 """Tests of grass.grassdb.manage"""
 
+import os
+
 from pathlib import Path
 
 from grass.grassdb.manage import MapsetPath, resolve_mapset_path, split_mapset_path
@@ -33,7 +35,8 @@ def test_mapset_from_path_object(self):
             path=full_path, directory=path, location=location_name, mapset=mapset_name
         )
         # Paths are currently stored as is (not resolved).
-        self.assertEqual(mapset_path.directory, path)
+        # pathlib uses os.sep for string represtentation of Path objects
+        self.assertEqual(mapset_path.directory, path.replace("/", os.sep))
         self.assertEqual(mapset_path.location, location_name)
         self.assertEqual(mapset_path.mapset, mapset_name)
         self.assertEqual(mapset_path.path, Path(path) / location_name / mapset_name)
@@ -51,7 +54,8 @@ def test_mapset_from_str(self):
             mapset=mapset_name,
         )
         # Paths are currently stored as is (not resolved).
-        self.assertEqual(mapset_path.directory, path)
+        # pathlib uses os.sep for string represtentation of Path objects
+        self.assertEqual(mapset_path.directory, path.replace("/", os.sep))
         self.assertEqual(mapset_path.location, location_name)
         self.assertEqual(mapset_path.mapset, mapset_name)
         self.assertEqual(mapset_path.path, Path(path) / location_name / mapset_name)
@@ -67,7 +71,7 @@ def test_split_path(self):
         ref_mapset = "test_mapset_1"
         path = Path(ref_db) / ref_location / ref_mapset
         new_db, new_location, new_mapset = split_mapset_path(path)
-        self.assertEqual(new_db, ref_db)
+        self.assertEqual(new_db, ref_db.replace("/", os.sep))
         self.assertEqual(new_location, ref_location)
         self.assertEqual(new_mapset, ref_mapset)
 
@@ -78,7 +82,7 @@ def test_split_str(self):
         ref_mapset = "test_mapset_1"
         path = Path(ref_db) / ref_location / ref_mapset
         new_db, new_location, new_mapset = split_mapset_path(str(path))
-        self.assertEqual(new_db, ref_db)
+        self.assertEqual(new_db, ref_db.replace("/", os.sep))
         self.assertEqual(new_location, ref_location)
         self.assertEqual(new_mapset, ref_mapset)
 
@@ -89,7 +93,7 @@ def test_split_str_trailing_slash(self):
         ref_mapset = "test_mapset_1"
         path = Path(ref_db) / ref_location / ref_mapset
         new_db, new_location, new_mapset = split_mapset_path(str(path) + "/")
-        self.assertEqual(new_db, ref_db)
+        self.assertEqual(new_db, ref_db.replace("/", os.sep))
         self.assertEqual(new_location, ref_location)
         self.assertEqual(new_mapset, ref_mapset)
 
@@ -135,7 +139,9 @@ def test_mapset_from_parts(self):
         mapset_path = resolve_mapset_path(
             path=path, location=location_name, mapset=mapset_name
         )
-        self.assertEqual(mapset_path.directory, str(Path(path).resolve()))
+        self.assertEqual(
+            mapset_path.directory, str(Path(path).resolve()).replace("/", os.sep)
+        )
         self.assertEqual(mapset_path.location, location_name)
         self.assertEqual(mapset_path.mapset, mapset_name)
         self.assertEqual(
@@ -149,7 +155,9 @@ def test_mapset_from_path(self):
         mapset_name = "test_mapset_1"
         full_path = str(Path(path) / location_name / mapset_name)
         mapset_path = resolve_mapset_path(path=full_path)
-        self.assertEqual(mapset_path.directory, str(Path(path).resolve()))
+        self.assertEqual(
+            mapset_path.directory, str(Path(path).resolve()).replace("/", os.sep)
+        )
         self.assertEqual(mapset_path.location, location_name)
         self.assertEqual(mapset_path.mapset, mapset_name)
         self.assertEqual(

python/grass/gunittest/case.py

@@ -206,8 +206,13 @@ def assertLooksLike(self, actual, reference, msg=None):
             isinstance(reference, (str, unicode)),
             ("reference argument is not a string"),
         )
+        if os.linesep != "\n" and os.linesep in reference:
+            reference = reference.replace(os.linesep, "\n")
         if os.linesep != "\n" and os.linesep in actual:
             actual = actual.replace(os.linesep, "\n")
+        # Strip newlines (esp. \r) that may remain after splitting lines
+        reference = reference.strip()
+        actual = actual.strip()
         if not check_text_ellipsis(actual=actual, reference=reference):
             # TODO: add support for multiline (first line general, others with details)
             standardMsg = '"%s" does not correspond with "%s"' % (actual, reference)
@@ -240,6 +245,8 @@ def assertModuleKeyValue(
         which is typically obtained using ``-g`` flag.
         """
         if isinstance(reference, str):
+            if os.linesep != "\n" and os.linesep in reference:
+                reference = reference.replace(os.linesep, "\n")
             reference = text_to_keyvalue(reference, sep=sep, skip_empty=True)
         module = _module_from_parameters(module, **parameters)
         self.runModule(module, expecting_stdout=True)

python/grass/gunittest/gmodules.py

@@ -9,6 +9,7 @@
 :authors: Vaclav Petras, Soeren Gebbert
 """
 
+import os
 import subprocess
 from grass.script.core import start_command
 from grass.script.utils import encode, decode
@@ -138,4 +139,11 @@ def call_module(
     returncode = process.poll()
     if returncode:
         raise CalledModuleError(module, kwargs, returncode, errors)
-    return decode(output) if output else None
+    output = decode(output) if output else None
+    # Make sure that universal newlines are returned
+    output = (
+        output.replace(os.linesep, "\n")
+        if os.linesep != "\n" and type(output) is str
+        else output
+    )
+    return output

python/grass/gunittest/testsuite/test_assertions.py

@@ -349,7 +349,7 @@ def setUpClass(cls):
         open(cls.emtpy_file, "w").close()
         cls.file_with_md5 = cls.__name__ + "_this_is_a_file_with_known_md5"
         file_content = "Content of the file with known MD5.\n"
-        with open(cls.file_with_md5, "w") as f:
+        with open(cls.file_with_md5, "w", newline="") as f:
             f.write(file_content)
         # MD5 sum created using:
         # echo 'Content of the file with known MD5.' > some_file.txt

python/grass/gunittest/testsuite/test_checkers.py

@@ -373,7 +373,7 @@ def setUpClass(cls):
             for line in CORRECT_LINES:
                 # \n should be converted to platform newline
                 f.write(line + "\n")
-        with open(cls.correct_file_name_unix_nl, "w") as f:
+        with open(cls.correct_file_name_unix_nl, "w", newline="") as f:
             for line in CORRECT_LINES:
                 # binary mode will write pure \n
                 f.write(line + "\n")

python/grass/pygrass/raster/testsuite/test_category.py

@@ -82,7 +82,11 @@ def testWrite(self):
         cats = Category(self.name)
         cats.read()
         cats.write_rules(tmpfile)
-        self.assertFilesEqualMd5(tmpfile, "data/geology_cats")
+        with open(tmpfile, "r") as act:
+            actual = act.read()
+        with open("data/geology_cats", "r") as ref:
+            reference = ref.read()
+        self.assertLooksLike(actual, reference)
 
 
 if __name__ == "__main__":