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

Update git.list_worktree tests to reflect new return data #30522

merged 2 commits into from Jan 21, 2016


None yet
2 participants

terminalmage commented Jan 21, 2016

This pull request removes the integration tests for git.list_worktrees. The
reason for this is that the changed output would require much more
heavily-mocked file reads/command runs as the expanded output reads from more
files and gathers more data than it did before. Since this only affects git
versions 2.5.0 <= X < 2.7.0, it's lower priority to include tests for it at
this time, and for that matter the work done for 2.5.0 <= X < 2.7.0 is
basically a hack since all releases starting with 2.7.0 and later come with a
native command to list information about worktrees.

The removed asserts from the integration tests have been replaced with unit
tests designed to test the ability of git.list_worktrees to properly parse the
output of 'git worktree list'.

terminalmage added some commits Jan 21, 2016

Remove git.list_worktrees tests
These are being added back as unit tests.

This comment has been minimized.

Show comment
Hide comment

terminalmage commented Jan 21, 2016

Fixes #30520.

cachedout added a commit that referenced this pull request Jan 21, 2016

Merge pull request #30522 from terminalmage/fix-worktree-tests
Update git.list_worktree tests to reflect new return data

@cachedout cachedout merged commit 79528c5 into saltstack:2015.8 Jan 21, 2016

2 of 5 checks passed

default Merged build finished.
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11522 — FAILURE
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #9002 — FAILURE
jenkins/salt-pr-clone Salt PR - Clone Repository #12932 — SUCCESS
jenkins/salt-pr-lint-n Salt PR - Code Lint #12620 — SUCCESS

@terminalmage terminalmage deleted the terminalmage:fix-worktree-tests branch Jan 21, 2016

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