fix path issue

Author: SandrineP

test/test_branch.py

@@ -5,24 +5,33 @@
 
 
 def test_branch_list(xtl_clone, git2cpp_path, tmp_path, run_in_tmp_path):
+    assert (tmp_path / "xtl").exists()
+    xtl_path = tmp_path / "xtl"
+
     cmd = [git2cpp_path, 'branch']
-    p = subprocess.run(cmd, capture_output=True, cwd=tmp_path, text=True)
+    p = subprocess.run(cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p.returncode == 0
     assert(p.stdout == '* master\n')
 
 
 def test_branch_create_delete(xtl_clone, git2cpp_path, tmp_path, run_in_tmp_path):
+    assert (tmp_path / "xtl").exists()
+    xtl_path = tmp_path / "xtl"
+
     create_cmd = [git2cpp_path, 'branch', 'foregone']
-    p_create = subprocess.run(create_cmd, capture_output=True, cwd=tmp_path, text=True)
+    p_create = subprocess.run(create_cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p_create.returncode == 0
 
     list_cmd = [git2cpp_path, 'branch']
-    p_list = subprocess.run(list_cmd, capture_output=True, cwd=tmp_path, text=True)
+    p_list = subprocess.run(list_cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p_list.returncode == 0
     assert(p_list.stdout == '  foregone\n* master\n')
 
+    # Problem of right for "delete"? Maybe need a -D instead of -d
     del_cmd = [git2cpp_path, 'branch', '-d', 'foregone']
-    subprocess.run(del_cmd, capture_output=True, cwd=tmp_path, text=True)
-    p_list2 = subprocess.run(list_cmd, capture_output=True, cwd=tmp_path, text=True)
+    p_del = subprocess.run(del_cmd, capture_output=True, cwd=tmp_path, text=True)
+    assert p_del.returncode == 0
+
+    p_list2 = subprocess.run(list_cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p_list2.returncode == 0
     assert(p_list2.stdout == '* master\n')

test/test_checkout.py

@@ -5,37 +5,43 @@
 
 
 def test_checkout(xtl_clone, git2cpp_path, tmp_path, run_in_tmp_path):
+    assert (tmp_path / "xtl").exists()
+    xtl_path = tmp_path / "xtl"
+
     create_cmd = [git2cpp_path, 'branch', 'foregone']
-    p_create = subprocess.run(create_cmd, capture_output=True, cwd=tmp_path, text=True)
+    p_create = subprocess.run(create_cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p_create.returncode == 0
 
     checkout_cmd = [git2cpp_path, 'checkout', 'foregone']
-    p_checkout = subprocess.run(checkout_cmd, capture_output=True, cwd=tmp_path, text=True)
+    p_checkout = subprocess.run(checkout_cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p_checkout.returncode == 0
     assert(p_checkout.stdout == '');
 
     branch_cmd = [git2cpp_path, 'branch']
-    p_branch = subprocess.run(branch_cmd, capture_output=True, cwd=tmp_path, text=True)
+    p_branch = subprocess.run(branch_cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p_branch.returncode == 0
     assert(p_branch.stdout == '* foregone\n  master\n')
 
     checkout_cmd[2] = 'master'
-    p_checkout2 = subprocess.run(checkout_cmd, capture_output=True, cwd=tmp_path, text=True)
+    p_checkout2 = subprocess.run(checkout_cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p_checkout2.returncode == 0
 
 
 def test_checkout_b(xtl_clone, git2cpp_path, tmp_path, run_in_tmp_path):
+    assert (tmp_path / "xtl").exists()
+    xtl_path = tmp_path / "xtl"
+
     checkout_cmd = [git2cpp_path, 'checkout', '-b', 'foregone']
-    p_checkout = subprocess.run(checkout_cmd, capture_output=True, cwd=tmp_path, text=True)
+    p_checkout = subprocess.run(checkout_cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p_checkout.returncode == 0
     assert(p_checkout.stdout == '');
 
     branch_cmd = [git2cpp_path, 'branch']
-    p_branch = subprocess.run(branch_cmd, capture_output=True, cwd=tmp_path, text=True)
+    p_branch = subprocess.run(branch_cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p_branch.returncode == 0
     assert(p_branch.stdout == '* foregone\n  master\n')
 
     checkout_cmd.remove('-b')
     checkout_cmd[2] = 'master'
-    p_checkout2 = subprocess.run(checkout_cmd, cwd=tmp_path, text=True)
+    p_checkout2 = subprocess.run(checkout_cmd, cwd=xtl_path, text=True)
     assert p_checkout2.returncode == 0

test/test_commit.py

@@ -6,25 +6,28 @@
 
 @pytest.mark.parametrize("all_flag", ["", "-A", "--all", "--no-ignore-removal"])
 def test_commit(xtl_clone, git_config, git2cpp_path, tmp_path, run_in_tmp_path, tmp_path_factory, monkeypatch, all_flag):
-    f = tmp_path / "xtl/mook_file.txt"
-    f.write_text('')
+    assert (tmp_path / "xtl").exists()
+    xtl_path = tmp_path / "xtl"
+
+    p = xtl_path / "mook_file.txt"
+    p.write_text('')
 
     cmd_add = [git2cpp_path, 'add', "mook_file.txt"]
-    p_add = subprocess.run(cmd_add, cwd=tmp_path, text=True)
+    p_add = subprocess.run(cmd_add, cwd=xtl_path, text=True)
     assert p_add.returncode == 0
 
     cmd_status = [git2cpp_path, 'status', "--long"]
-    p_status = subprocess.run(cmd_status, capture_output=True, cwd=tmp_path, text=True)
+    p_status = subprocess.run(cmd_status, capture_output=True, cwd=xtl_path, text=True)
     assert p_status.returncode == 0
 
     assert "Changes to be committed" in p_status.stdout
     assert "new file" in p_status.stdout
 
     cmd_commit = [git2cpp_path, 'commit', "-m", "test commit"]
-    p_commit = subprocess.run(cmd_commit, cwd=tmp_path, text=True)
+    p_commit = subprocess.run(cmd_commit, cwd=xtl_path, text=True)
     assert p_commit.returncode == 0
 
     cmd_status_2 = [git2cpp_path, 'status', "--long"]
-    p_status_2 = subprocess.run(cmd_status_2, capture_output=True, cwd=tmp_path, text=True)
+    p_status_2 = subprocess.run(cmd_status_2, capture_output=True, cwd=xtl_path, text=True)
     assert p_status_2.returncode == 0
     assert "mook_file" not in p_status_2.stdout

test/test_status.py

@@ -7,21 +7,24 @@
 
 @pytest.mark.parametrize("short_flag", ["", "-s", "--short"])
 @pytest.mark.parametrize("long_flag", ["", "--long"])
-def test_status_new_file(xtl_clone, git2cpp_path, tmp_path, run_in_tmp_path, tmp_path_factory, short_flag, long_flag):
-    f = tmp_path / "xtl/mook_file.txt"   # Untracked files
-    f.write_text('')
+def test_status_new_file(xtl_clone, git2cpp_path, tmp_path, run_in_tmp_path, short_flag, long_flag):
+    assert (tmp_path / "xtl").exists()
+    xtl_path = tmp_path / "xtl"
+
+    p = xtl_path / "mook_file.txt"   # Untracked files
+    p.write_text('')
 
-    fw = tmp_path / "xtl/CMakeLists.txt"   # Changes not staged for commit / modified
-    fw.write("blablabla")
+    pw = xtl_path / "CMakeLists.txt"   # Changes not staged for commit / modified
+    pw.write_text("blablabla")
 
-    os.remove(tmp_path / "xtl/README.md")   # Changes not staged for commit / deleted
+    os.remove(xtl_path / "README.md")   # Changes not staged for commit / deleted
 
     cmd = [git2cpp_path, 'status']
     if short_flag != "":
         cmd.append(short_flag)
     if long_flag != "":
         cmd.append(long_flag)
-    p = subprocess.run(cmd, capture_output=True, cwd=tmp_path, text=True)
+    p = subprocess.run(cmd, capture_output=True, cwd=xtl_path, text=True)
 
     if (long_flag == "--long") or ((long_flag == "") & (short_flag == "")):
         assert "On branch master" in p.stdout