diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/git/test_commit.py | 4 | ||||
| -rw-r--r-- | test/git/test_repo.py | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/git/test_commit.py b/test/git/test_commit.py index e9336f2c..df9ea039 100644 --- a/test/git/test_commit.py +++ b/test/git/test_commit.py @@ -22,7 +22,7 @@ class TestCommit(object): assert_equal("tom@mojombo.com", commit.author.email) assert_true(git.called) - assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017'), {'pretty': 'raw', 'max_count': 1})) + assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017', '--'), {'pretty': 'raw', 'max_count': 1})) @patch_object(Git, '_call_process') def test_id_abbrev(self, git): @@ -184,7 +184,7 @@ class TestCommit(object): assert_equal(["a.txt", "b.txt"], keys) assert_true(git.called) - assert_equal(git.call_args, (('diff', '634396b2f541a9f2d58b00be1a07f0c358b999b3'), {'numstat': True})) + assert_equal(git.call_args, (('diff', '634396b2f541a9f2d58b00be1a07f0c358b999b3', '--'), {'numstat': True})) @patch_object(Git, '_call_process') def test_rev_list_bisect_all(self, git): diff --git a/test/git/test_repo.py b/test/git/test_repo.py index 79c2dd8c..67489b39 100644 --- a/test/git/test_repo.py +++ b/test/git/test_repo.py @@ -70,7 +70,7 @@ class TestRepo(object): assert_equal("Merge branch 'site'", c.message) assert_true(git.called) - assert_equal(git.call_args, (('rev_list', 'master'), {'skip': 0, 'pretty': 'raw', 'max_count': 10})) + assert_equal(git.call_args, (('rev_list', 'master', '--'), {'skip': 0, 'pretty': 'raw', 'max_count': 10})) @patch_object(Git, '_call_process') def test_commit_count(self, git): @@ -79,7 +79,7 @@ class TestRepo(object): assert_equal(655, self.repo.commit_count('master')) assert_true(git.called) - assert_equal(git.call_args, (('rev_list', 'master'), {})) + assert_equal(git.call_args, (('rev_list', 'master', '--'), {})) @patch_object(Git, '_call_process') def test_commit(self, git): @@ -90,7 +90,7 @@ class TestRepo(object): assert_equal("4c8124ffcf4039d292442eeccabdeca5af5c5017", commit.id) assert_true(git.called) - assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017'), {'pretty': 'raw', 'max_count': 1})) + assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017', '--'), {'pretty': 'raw', 'max_count': 1})) @patch_object(Git, '_call_process') def test_tree(self, git): @@ -269,7 +269,7 @@ class TestRepo(object): assert_equal('ab25fd8483882c3bda8a458ad2965d2248654335', self.repo.log()[-1].id) assert_true(git.called) assert_equal(git.call_count, 2) - assert_equal(git.call_args, (('log', 'master'), {'pretty': 'raw'})) + assert_equal(git.call_args, (('log', 'master', '--'), {'pretty': 'raw'})) @patch_object(Git, '_call_process') def test_log_with_path_and_options(self, git): @@ -314,14 +314,14 @@ class TestRepo(object): self.repo.bare = False git.return_value = '' assert_false(self.repo.is_dirty) - assert_equal(git.call_args, (('diff', 'HEAD'), {})) + assert_equal(git.call_args, (('diff', 'HEAD', '--'), {})) @patch_object(Git, '_call_process') def test_is_dirty_with_dirty_working_dir(self, git): self.repo.bare = False git.return_value = '''-aaa\n+bbb''' assert_true(self.repo.is_dirty) - assert_equal(git.call_args, (('diff', 'HEAD'), {})) + assert_equal(git.call_args, (('diff', 'HEAD', '--'), {})) @patch_object(Git, '_call_process') def test_active_branch(self, git): |