Skip to content

tests: Add test_git_stash_workspace_reinstate_index #184

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 14, 2023
Merged

tests: Add test_git_stash_workspace_reinstate_index #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e53de78
tests: Add `test_git_stash_workspace_reinstate_index`
daavoo Feb 14, 2023
f902966
Update tests.yaml
daavoo Feb 14, 2023
7aa0497
Update docker-compose.yml
daavoo Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Lint code and check dependencies
continue-on-error: ${{ matrix.nox_pyv == '3.11' }}
run: nox -s lint safety
run: nox -s lint safety --verbose

- name: Run tests
run: nox -s tests-${{ matrix.nox_pyv || matrix.pyv }} -- --slow --cov-report=xml
Expand Down
2 changes: 1 addition & 1 deletion tests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '3.2'
services:
git-server:
image: ghcr.io/linuxserver/openssh-server
image: ghcr.io/linuxserver/openssh-server:9.0_p1-r2-ls100
environment:
- USER_NAME=user
- PUBLIC_KEY_FILE=/tmp/key
Expand Down
17 changes: 17 additions & 0 deletions tests/test_stash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,23 @@ def test_git_stash_workspace(tmp_dir: TmpDir, scm: Git):
assert (tmp_dir / "file").read_text() == "1"


def test_git_stash_workspace_reinstate_index(tmp_dir: TmpDir, scm: Git):
tmp_dir.gen({"modified": "init", "deleted": "deleted"})
scm.add_commit(["modified", "deleted"], "init")

tmp_dir.gen({"newfile": "nefile"})
scm.add("newfile")
tmp_dir.gen({"modified": "modified"})
scm.add("modified")
(tmp_dir / "deleted").unlink()
scm.add("deleted")

prev_status = scm.status()
with scm.stash_workspace(reinstate_index=True):
pass
assert scm.status() == prev_status


@pytest.mark.parametrize(
"ref, include_untracked",
[
Expand Down