Added missing 'cwd' in __main__.py for branch checking; Added exception catch to test_existing_module

Author: OCopping

src/dls_python3_skeleton/__main__.py

@@ -66,7 +66,7 @@ def replace_text(text: str) -> str:
         text = text.replace("[email protected]", email)
         return text
 
-    branches = [x[2:] for x in str(git("branch", "--list")).split("\n")]
+    branches = [x[2:] for x in str(git("branch", "--list", cwd=path)).split("\n")]
 
     if MERGE_BRANCH in branches:
         raise Exception(

tests/test_dls_python3_skeleton.py

@@ -95,26 +95,28 @@ def test_existing_module(tmp_path: Path):
 Instructions on how to develop this module are in CONTRIBUTING.rst
 """
     )
-
+    __main__.git("merge", "--abort", cwd=str(module))
     MERGE_BRANCH = "skeleton-merge-branch"
-    output = check_output(
-        sys.executable,
-        "-m",
-        "dls_python3_skeleton",
-        "existing",
-        str(module),
-    )
-    assert output.endswith(
+
+    with pytest.raises(Exception) as excinfo:
+        output = check_output(
+            sys.executable,
+            "-m",
+            "dls_python3_skeleton",
+            "existing",
+            str(module),
+        )
+    assert (
         f"{MERGE_BRANCH} already exists. \
                 Please run 'dls-python3-skeleton clean' to remove it."
+        in str(excinfo.value)
     )
 
     branches = [
         x[2:]
         for x in str(__main__.git("branch", "--list", cwd=str(module))).split("\n")
     ]
     assert MERGE_BRANCH in branches
-    # __main__.git("checkout", "-", cwd=str(module))
     output = check_output(
         sys.executable,
         "-m",