New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing git worktree tests #48883

Merged
merged 1 commit into from Aug 2, 2018

Conversation

Projects
None yet
2 participants
@terminalmage
Member

terminalmage commented Aug 2, 2018

Git 2.18.0 changed the output format against which some of the asserts in this test are performed. Instead of displaying the full path to the worktree, it now references the branch name instead. This test updates the asserts to look for the basename instead, which should allow it to pass on Git releases both before and after 2.18.0.

Fix failing git worktree tests
Git 2.18.0 changed the output format against which some of the asserts
in this test are performed. Instead of displaying the full path to the
worktree, it now references the branch name instead. This test updates
the asserts to look for the basename instead, which should allow it to
pass on Git releases both before and after 2.18.0.

@rallytime rallytime merged commit 0ca0b6f into saltstack:2017.7 Aug 2, 2018

5 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details

@terminalmage terminalmage deleted the terminalmage:salt-jenkins-1023 branch Aug 6, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment