Finally fix tests on Windows.

Author: domdfcoding

repo_helper/cli/utils.py

@@ -27,6 +27,7 @@
 import datetime
 import logging
 import os
+import platform
 import textwrap
 from typing import Iterable, Optional
 
@@ -90,12 +91,18 @@ def commit_changed_files(
 	staged_files = []
 
 	for filename in managed_files:
-		if filename.encode("UTF-8") in unstaged_changes or filename in untracked_files:
-			r.stage(os.path.normpath(filename))
+		if filename.encode("UTF-8") in unstaged_changes or os.path.normpath(filename) in untracked_files:
+			r.stage(filename)
+			staged_files.append(filename)
+		elif (
+				os.path.normpath(filename) in stat.staged["add"]
+				or os.path.normpath(filename) in stat.staged["modify"]
+				or os.path.normpath(filename) in stat.staged["delete"]
+			):
 			staged_files.append(filename)
 
 	# Ensure pre-commit hooks are installed
-	if enable_pre_commit:
+	if enable_pre_commit and platform.system() == "Linux":
 		with in_directory(repo_path):
 			pre_commit.main.main(["install"])
 

requirements.txt

@@ -1,7 +1,7 @@
 apeye>=0.3.0
 attrs>=20.2.0
 click==7.1.2
-configconfig>=0.3.0
+configconfig>=0.4.0
 consolekit>=0.1.2
 css-parser==1.0.6
 domdf-python-tools>=1.1.0

tests/test_core.py

@@ -1,5 +1,6 @@
 # stdlib
 import datetime
+import os
 import pathlib
 import re
 from tempfile import TemporaryDirectory
@@ -22,7 +23,44 @@
 FAKE_DATE = datetime.date(2020, 7, 25)
 
 
-def test_via_run_repo_helper(capsys, file_regression: FileRegressionFixture, monkeypatch):
+@pytest.mark.skipif(condition=os.sep == "\\", reason="Different test for platforms where os.sep == \\")
+def test_via_run_repo_helper_forward(capsys, file_regression: FileRegressionFixture, monkeypatch):
+
+	# Monkeypatch dulwich so it doesn't try to use the global config.
+	monkeypatch.setattr(StackedConfig, "default_backends", lambda *args: [], raising=True)
+	monkeypatch.setenv("GIT_COMMITTER_NAME", "Guido")
+	monkeypatch.setenv("GIT_COMMITTER_EMAIL", "[email protected]")
+	monkeypatch.setenv("GIT_AUTHOR_NAME", "Guido")
+	monkeypatch.setenv("GIT_AUTHOR_EMAIL", "[email protected]")
+
+	monkeypatch.setattr(repo_helper.utils, "today", FAKE_DATE)
+
+	with TemporaryDirectory() as tmpdir:
+
+		path = PathPlus(tmpdir) / "~$tmp"
+		path.mkdir()
+		Repo.init(path)
+
+		(path / "repo_helper.yml").write_text((pathlib.Path(__file__).parent / "repo_helper.yml_").read_text())
+
+		run_repo_helper(path, force=False, initialise=True, commit=True, message="Testing Testing")
+
+		assert not status(path).untracked
+		assert not status(path).unstaged
+
+		run_repo_helper(path, force=False, initialise=False, commit=True, message="Updated")
+
+		assert not status(path).untracked
+		assert not status(path).unstaged
+
+		sha = "6d8cf72fff6adc4e570cb046ca417db7f2e10a3b"
+		stdout = re.sub(f"Committed as [A-Za-z0-9]{{{len(sha)}}}", f"Committed as {sha}", capsys.readouterr().out)
+		file_regression.check(stdout, extension="_stdout.txt", encoding="UTF-8")
+		file_regression.check(capsys.readouterr().err, extension="_stderr.txt", encoding="UTF-8")
+
+
+@pytest.mark.skipif(condition=os.sep == "/", reason="Different test for platforms where os.sep == /")
+def test_via_run_repo_helper_backward(capsys, file_regression: FileRegressionFixture, monkeypatch):
 
 	# Monkeypatch dulwich so it doesn't try to use the global config.
 	monkeypatch.setattr(StackedConfig, "default_backends", lambda *args: [], raising=True)

tests/test_core_/test_via_run_repo_helper_backward_stderr.txt

@@ -0,0 +1,43 @@
+
+The following files will be committed:
+  .dependabot\config.yml
+  .github\ISSUE_TEMPLATE\bug_report.md
+  .github\ISSUE_TEMPLATE\feature_request.md
+  .github\workflows\docs_test_action.yml
+  .github\workflows\octocheese.yml
+  .github\workflows\python_ci.yml
+  .github\workflows\python_ci_macos.yml
+  .github\auto_assign.yml
+  .github\stale.yml
+  doc-source\404.rst
+  doc-source\conf.py
+  doc-source\contributing.rst
+  doc-source\docutils.conf
+  doc-source\git_download.png
+  doc-source\index.rst
+  doc-source\not-found.png
+  doc-source\requirements.txt
+  doc-source\Source.rst
+  tests\requirements.txt
+  .bumpversion.cfg
+  .gitignore
+  .imgbotconfig
+  .isort.cfg
+  .pre-commit-config.yaml
+  .pylintrc
+  .readthedocs.yml
+  .style.yapf
+  .travis.yml
+  __pkginfo__.py
+  CONTRIBUTING.rst
+  lint_roller.sh
+  MANIFEST.in
+  pyproject.toml
+  README.rst
+  repo_helper.yml
+  setup.cfg
+  setup.py
+  tox.ini
+
+Committed as 6d8cf72fff6adc4e570cb046ca417db7f2e10a3b
+Nothing to commit

tests/test_core_/test_via_run_repo_helper_backward_stdout.txt

@@ -0,0 +1,43 @@
+
+The following files will be committed:
+  .dependabot/config.yml
+  .github/ISSUE_TEMPLATE/bug_report.md
+  .github/ISSUE_TEMPLATE/feature_request.md
+  .github/workflows/docs_test_action.yml
+  .github/workflows/octocheese.yml
+  .github/workflows/python_ci.yml
+  .github/workflows/python_ci_macos.yml
+  .github/auto_assign.yml
+  .github/stale.yml
+  doc-source/404.rst
+  doc-source/Source.rst
+  doc-source/conf.py
+  doc-source/contributing.rst
+  doc-source/docutils.conf
+  doc-source/git_download.png
+  doc-source/index.rst
+  doc-source/not-found.png
+  doc-source/requirements.txt
+  tests/requirements.txt
+  .bumpversion.cfg
+  .gitignore
+  .imgbotconfig
+  .isort.cfg
+  .pre-commit-config.yaml
+  .pylintrc
+  .readthedocs.yml
+  .style.yapf
+  .travis.yml
+  CONTRIBUTING.rst
+  MANIFEST.in
+  README.rst
+  __pkginfo__.py
+  lint_roller.sh
+  pyproject.toml
+  repo_helper.yml
+  setup.cfg
+  setup.py
+  tox.ini
+
+Committed as 6d8cf72fff6adc4e570cb046ca417db7f2e10a3b
+Nothing to commit