diff options
| -rw-r--r-- | core/TESTS/test_imports.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/TESTS/test_imports.py b/core/TESTS/test_imports.py index 60c8a7f..94c7653 100644 --- a/core/TESTS/test_imports.py +++ b/core/TESTS/test_imports.py @@ -228,18 +228,18 @@ class SubprocessTest(TestCase): self.assertTrue(sp.returncode == 0, f"{cwd} - git is unhappy") content = sp.stdout - ph = r"Your branch is up[ -]to[ -]date" + ph = r"nothing to commit, working tree clean" phmatch = re.search(ph, content) msg = f'{cwd} - Failed to find expected git output: "{ph}"' self.assertIsNotNone(phmatch, msg) - ph1 = r"no changes added to commit" - phmatch1 = re.search(ph1, content) - ph2 = r"nothing to commit" - phmatch2 = re.search(ph2, content) - phmatch = phmatch1 or phmatch2 - msg = f'{cwd} - Failed to find expected git output: "{ph1}" or "{ph2}"' - self.assertIsNotNone(phmatch, msg) + # ph1 = r"no changes added to commit" + # phmatch1 = re.search(ph1, content) + # ph2 = r"nothing to commit" + # phmatch2 = re.search(ph2, content) + # phmatch = phmatch1 or phmatch2 + # msg = f'{cwd} - Failed to find expected git output: "{ph1}" or "{ph2}"' + # self.assertIsNotNone(phmatch, msg) def test_loser_survex_status(self): """Expects no failures of survex files""" |