Fixing posix <-> windows compatibility issues.

repo-helper · Oct 25, 2020 · a789591 · a789591
1 parent fcbd28d
commit a789591
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/tests/test_cli/test_make_schema.py b/tests/test_cli/test_make_schema.py
@@ -19,6 +19,9 @@ def test_make_schema(tmp_pathplus):
 		if os.sep == "/":
 			assert re.match(r"Wrote schema to .*/repo_helper/repo_helper_schema\.json", result.stdout)
 		elif os.sep == "\\":
-			assert re.match(r"Wrote schema to .*\\repo_helper\\/repo_helper_schema\.json", result.stdout)
+			assert re.match(
+					r"Wrote schema to .*\\repo_helper\\/repo_helper_schema\.json",
+					result.stdout.splitlines()[0],
+					)
 		else:
 			raise NotImplementedError(os.sep)
diff --git a/tests/test_git_tools.py b/tests/test_git_tools.py
@@ -27,6 +27,7 @@
 # 3rd party
 import pytest
 from domdf_python_tools.paths import PathPlus
+from domdf_python_tools.testing import not_windows
 from pytest_git import GitRepo  # type: ignore
 from pytest_regressions.data_regression import DataRegressionFixture
 from pytest_regressions.file_regression import FileRegressionFixture
@@ -60,6 +61,7 @@ def test_log_from_tag(tmp_repo, file_regression: FileRegressionFixture):
 		Log(tmp_repo).log(from_tag="v5.0.0")
 
 
+@not_windows(reason="Patchy on Windows")
 def test_check_git_status(git_repo: GitRepo):
 	repo_path = PathPlus(git_repo.workspace)
 	clean, files = check_git_status(repo_path)