From 765a1ebfbeb625f098de535e5d392d6067976b04 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 13 Jul 2018 10:49:58 -0700 Subject: [PATCH] also match updated git output (#73) --- test/test_commands.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/test_commands.py b/test/test_commands.py index d12aaf42..043eb03b 100644 --- a/test/test_commands.py +++ b/test/test_commands.py @@ -21,7 +21,9 @@ def setUpClass(cls): output = run_command( 'import', ['--input', REPOS_FILE, '.']) expected = get_expected_output('import') - assert output == expected + # newer git versions don't append three dots after the commit hash + assert output == expected or \ + output == expected.replace(b'... ', b' ') except Exception: cls.tearDownClass() raise @@ -89,7 +91,8 @@ def test_reimport(self): subprocess.check_output( ['git', 'remote', 'remove', 'foo'], stderr=subprocess.STDOUT, cwd=cwd) - self.assertEqual(output, expected) + # newer git versions don't append three dots after the commit hash + assert output == expected or output == expected.replace(b'... ', b' ') def test_remote(self): output = run_command('remotes', args=['--repos'])