def test_merge_git_repo_branch_is_dirty(self,
mock_bic,
mock_gcb,
mock_getcwd,
mock_chdir):
self.assertEquals([('INFO', 'Checking: /foo/bar'), ('INFO', 'Uncommitted changes, skipping...')],
merge_git_repo._fn('bar'))
def test_merge_git_repo_branch_raise_output(self,
mock_cb,
mock_npp,
mock_git,
mock_bic,
mock_gcb,
mock_getcwd,
mock_chdir):
self.assertEquals([('INFO', 'Checking: /foo/bar'),
('INFO', 'Need merge! '),
('INFO', 'Try to merge Branch: master in /foo/bar'),
('INFO', 'Merge failed: ')], merge_git_repo._fn('bar'))
def test_merge_git_repo_branch_no_pull_not_master(self,
mock_cb,
mock_npp,
mock_git,
mock_bic,
mock_gcb,
mock_getcwd,
mock_chdir):
self.assertEquals([('INFO', 'Checking: /foo/bar'),
('INFO', 'Checkout master'),
('INFO', 'Nothing to do in master... Switch back')],
merge_git_repo._fn('bar'))
def test_merge_git_repo_branch_is_clean(self,
mock_npp,
mock_git,
mock_bic,
mock_gcb,
mock_getcwd,
mock_chdir):
self.assertEquals([('INFO', 'Checking: /foo/bar'),
('INFO', 'Need merge! '),
('INFO', 'Try to merge Branch: master in /foo/bar'),
('INFO', 'Start merge...'),
('INFO', 'Merge complete!')],
merge_git_repo._fn('bar'))
