Skip to content

Commit

Permalink
also match updated git output (dirk-thomas#73)
Browse files Browse the repository at this point in the history
  • Loading branch information
dirk-thomas authored Jul 13, 2018
1 parent 8de9f33 commit 765a1eb
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions test/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'])
Expand Down

0 comments on commit 765a1eb

Please sign in to comment.