Merge pull request #2236 from strictdoc-project/stanislaw/fix_textx_exc

tests/unit: fix a regression due to a recent textX change

Author: stanislaw

tasks.py

@@ -317,9 +317,11 @@ def test_end2end(
 
 
 @task(aliases=["tu"])
-def test_unit(context):
+def test_unit(context, focus=None):
     Path(TEST_REPORTS_DIR).mkdir(parents=True, exist_ok=True)
 
+    focus_argument = f"-k {focus}" if focus is not None else ""
+
     cwd = os.getcwd()
 
     path_to_coverage_file = f"{cwd}/build/coverage/unit/.coverage"
@@ -331,22 +333,24 @@ def test_unit(context):
             --rcfile=.coveragerc.unit
             --data-file={path_to_coverage_file}
             -m pytest
+            {focus_argument}
             --junit-xml={TEST_REPORTS_DIR}/tests_unit.pytest.junit.xml
             -o cache_dir=build/pytest_unit_with_coverage
             -o junit_suite_name="StrictDoc Unit Tests"
             tests/unit/
         """,
     )
-    run_invoke_with_tox(
-        context,
-        ToxEnvironment.CHECK,
-        f"""
-            coverage report
-                --sort=cover
-                --rcfile=.coveragerc.unit
-                --data-file={path_to_coverage_file}
-        """,
-    )
+    if not focus:
+        run_invoke_with_tox(
+            context,
+            ToxEnvironment.CHECK,
+            f"""
+                coverage report
+                    --sort=cover
+                    --rcfile=.coveragerc.unit
+                    --data-file={path_to_coverage_file}
+            """,
+        )
 
 
 @task(test_unit)

tests/unit/strictdoc/backend/sdoc/test_dsl_passthrough.py

@@ -1029,7 +1029,7 @@ def test_edge_case_02_uid_present_but_empty_with_no_space_character():
         _ = reader.read(input_sdoc)
 
     assert exc_info.type is TextXSyntaxError
-    assert "Expected ': '" == exc_info.value.args[0].decode("utf-8")
+    assert "Expected ': '" == exc_info.value.args[0]
 
 
 def test_edge_case_03_uid_present_but_empty_with_space_character():
@@ -1048,9 +1048,7 @@ def test_edge_case_03_uid_present_but_empty_with_space_character():
         _ = reader.read(input_sdoc)
 
     assert exc_info.type is TextXSyntaxError
-    assert "Expected '([\\w]+[\\w()\\-\\/.: ]*)'" in exc_info.value.args[
-        0
-    ].decode("utf-8")
+    assert "Expected '([\\w]+[\\w()\\-\\/.: ]*)'" in exc_info.value.args[0]
 
 
 def test_edge_case_04_uid_present_but_empty_with_two_space_characters():
@@ -1069,9 +1067,7 @@ def test_edge_case_04_uid_present_but_empty_with_two_space_characters():
         _ = reader.read(input_sdoc)
 
     assert exc_info.type is TextXSyntaxError
-    assert "Expected '([\\w]+[\\w()\\-\\/.: ]*)'" in exc_info.value.args[
-        0
-    ].decode("utf-8")
+    assert "Expected '([\\w]+[\\w()\\-\\/.: ]*)'" in exc_info.value.args[0]
 
 
 def test_edge_case_10_empty_multiline_field():
@@ -1094,7 +1090,7 @@ def test_edge_case_10_empty_multiline_field():
         "Expected '^\\[ANCHOR: ' or '[LINK: ' or "
         "'(?ms)(?!^<<<)(?!\\[LINK: "
         "([\\w]+[\\w()\\-\\/.: ]*))(?!^\\[ANCHOR: "
-        "([\\w]+[\\w()\\-\\/.: ]*)).'" in exc_info.value.args[0].decode("utf-8")
+        "([\\w]+[\\w()\\-\\/.: ]*)).'" in exc_info.value.args[0]
     )
 
 
@@ -1115,9 +1111,7 @@ def test_edge_case_11_empty_multiline_field_with_one_newline():
         _ = reader.read(input_sdoc)
 
     assert exc_info.type is TextXSyntaxError
-    assert "Node statement cannot be empty." == exc_info.value.args[0].decode(
-        "utf-8"
-    )
+    assert "Node statement cannot be empty." == exc_info.value.args[0]
 
 
 def test_edge_case_19_empty_section_title():
@@ -1139,7 +1133,7 @@ def test_edge_case_19_empty_section_title():
     assert exc_info.type is TextXSyntaxError
     assert (
         "Expected 'MID: ' or 'UID: ' or 'LEVEL: ' or 'TITLE: '"
-        == exc_info.value.args[0].decode("utf-8")
+        == exc_info.value.args[0]
     )
 
 
@@ -1160,7 +1154,7 @@ def test_edge_case_20_empty_section_title():
         _ = reader.read(input_sdoc)
 
     assert exc_info.type is TextXSyntaxError
-    assert "Expected SingleLineString" == exc_info.value.args[0].decode("utf-8")
+    assert "Expected SingleLineString" == exc_info.value.args[0]
 
 
 def test_edge_case_21_section_title_with_empty_space():
@@ -1181,7 +1175,7 @@ def test_edge_case_21_section_title_with_empty_space():
         _ = reader.read(input_sdoc)
 
     assert exc_info.type is TextXSyntaxError
-    assert "Expected SingleLineString" in exc_info.value.args[0].decode("utf-8")
+    assert "Expected SingleLineString" in exc_info.value.args[0]
 
 
 def test_edge_case_22_section_title_with_two_empty_spaces():
@@ -1202,7 +1196,7 @@ def test_edge_case_22_section_title_with_two_empty_spaces():
         _ = reader.read(input_sdoc)
 
     assert exc_info.type is TextXSyntaxError
-    assert "Expected SingleLineString" in exc_info.value.args[0].decode("utf-8")
+    assert "Expected SingleLineString" == exc_info.value.args[0]
 
 
 def test_edge_case_23_leading_spaces_do_not_imply_empy_field(