From 4e51f005f246acbf6e9061b57c0176e12c41c1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sun, 27 Jul 2025 00:06:50 +0000 Subject: [PATCH 1/2] grass.gunittest: Mark test_assertVectorEqualsAscii_by_import as expectedFailure to enable running the remaining of the file --- python/grass/gunittest/testsuite/test_assertions_vect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/grass/gunittest/testsuite/test_assertions_vect.py b/python/grass/gunittest/testsuite/test_assertions_vect.py index 21ea545b42d..047c5c983b7 100644 --- a/python/grass/gunittest/testsuite/test_assertions_vect.py +++ b/python/grass/gunittest/testsuite/test_assertions_vect.py @@ -2,10 +2,10 @@ Tests assertion methods for vectors. """ +import unittest from grass.exceptions import CalledModuleError from grass.gunittest.case import TestCase from grass.gunittest.main import test -from grass.gunittest.utils import xfail_windows V_UNIVAR_SCHOOLS_WIDTH_SUBSET = """n=144 @@ -282,7 +282,7 @@ def test_assertVectorAsciiEqualsVectorAscii_diff_content(self): self.assertFileExists(self.simple_base_file) self.assertFileExists(self.simple_modified_file) - @xfail_windows + @unittest.expectedFailure def test_assertVectorEqualsAscii_by_import(self): amap = "simple_vector_map_imported_base" self.runModule( From 913bf63bc19b2f071774fda284bdc16609468e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sat, 26 Jul 2025 19:28:40 -0400 Subject: [PATCH 2/2] tests: Enable tests for gunittest's test_assertions_vect.py --- .github/workflows/macos_gunittest.cfg | 1 - .gunittest.cfg | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/macos_gunittest.cfg b/.github/workflows/macos_gunittest.cfg index b3b4842728c..96ebabe453c 100644 --- a/.github/workflows/macos_gunittest.cfg +++ b/.github/workflows/macos_gunittest.cfg @@ -6,7 +6,6 @@ exclude = gui/wxpython/core/testsuite/test_gcmd.py gui/wxpython/core/testsuite/toolboxes.sh - python/grass/gunittest/testsuite/test_assertions_vect.py python/grass/pygrass/raster/testsuite/test_pygrass_raster_doctests.py python/grass/pygrass/rpc/testsuite/test_pygrass_rpc_doctests.py python/grass/temporal/testsuite/unittests_temporal_raster_algebra_equal_ts.py diff --git a/.gunittest.cfg b/.gunittest.cfg index bb5636cbb51..a7987577c74 100644 --- a/.gunittest.cfg +++ b/.gunittest.cfg @@ -5,7 +5,6 @@ # but it includes mainly tests which can (and should) be fixed. exclude = gui/wxpython/core/testsuite/toolboxes.sh - python/grass/gunittest/testsuite/test_assertions_vect.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