Skip to content

Commit 009de85

Browse files
Fix expected git output.
I get slightly different output in one test than others.
1 parent a014e3c commit 009de85

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

src/mr/developer/tests/test_git.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ def testUpdateVerbose(self, develop, mkgitrepo, src, capsys):
169169
"* develop\n remotes/origin/HEAD -> origin/develop\n remotes/origin/develop\n remotes/origin/master\nBranch master set up to track remote branch master from origin.\n develop\n* master\n remotes/origin/HEAD -> origin/develop\n remotes/origin/develop\n remotes/origin/master\nAlready up-to-date.\n\n",
170170
"* develop\n remotes/origin/HEAD -> origin/develop\n remotes/origin/develop\n remotes/origin/master\nBranch 'master' set up to track remote branch 'master' from 'origin'.\n develop\n* master\n remotes/origin/HEAD -> origin/develop\n remotes/origin/develop\n remotes/origin/master\nAlready up to date.\n\n",
171171
"* develop\n remotes/origin/HEAD -> origin/develop\n remotes/origin/develop\n remotes/origin/master\nbranch 'master' set up to track 'origin/master'.\n develop\n* master\n remotes/origin/HEAD -> origin/develop\n remotes/origin/develop\n remotes/origin/master\nAlready up to date.\n\n",
172+
"* develop\n remotes/origin/HEAD -> origin/develop\n remotes/origin/develop\n remotes/origin/master\nbranch 'master' set up to track 'origin/master' by rebasing.\n develop\n* master\n remotes/origin/HEAD -> origin/develop\n remotes/origin/develop\n remotes/origin/master\nAlready up to date.\n\n",
172173
]
173174
assert captured.out in git_outputs
174175
CmdStatus(develop)(develop.parser.parse_args(['status', '-v']))

0 commit comments

Comments
 (0)