From eac22148c5dde428d53088c76ae095fc9442d46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Thu, 23 Jun 2022 19:15:28 +0200 Subject: [PATCH] e2e: Move invalid subdirectory test --- e2e_tests/test_worktrees.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/e2e_tests/test_worktrees.py b/e2e_tests/test_worktrees.py index 2695b0f..4948c43 100644 --- a/e2e_tests/test_worktrees.py +++ b/e2e_tests/test_worktrees.py @@ -114,16 +114,6 @@ def test_worktree_add_invalid_name(): assert "invalid worktree name" in str(cmd.stderr.lower()) -def test_worktree_add_into_invalid_subdirectory(): - with TempGitRepositoryWorktree() as (base_dir, _commit): - cmd = grm(["wt", "add", "/dir/test"], cwd=base_dir) - assert cmd.returncode == 1 - assert "dir" not in os.listdir(base_dir) - assert "dir" not in os.listdir("/") - - cmd = grm(["wt", "add", "dir/"], cwd=base_dir) - assert cmd.returncode == 1 - assert "dir" not in os.listdir(base_dir) @pytest.mark.parametrize("remote_branch_already_exists", [True, False]) @@ -232,6 +222,16 @@ def test_worktree_add_with_explicit_no_tracking( assert not repo.is_dirty() assert str(repo.active_branch) == "test" assert repo.active_branch.tracking_branch() is None +def test_worktree_add_into_invalid_subdirectory(): + with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit): + cmd = grm(["wt", "add", "/dir/test"], cwd=base_dir) + assert cmd.returncode == 1 + assert "dir" not in os.listdir(base_dir) + assert "dir" not in os.listdir("/") + + cmd = grm(["wt", "add", "dir/"], cwd=base_dir) + assert cmd.returncode == 1 + assert "dir" not in os.listdir(base_dir) def test_worktree_delete():