Use git_commit_file() elsewhere

alire-project · Oct 28, 2024 · d998f14 · d998f14
1 parent b3528dd
commit d998f14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/testsuite/tests/pin/branch/test.py b/testsuite/tests/pin/branch/test.py
@@ -4,8 +4,7 @@
 
 from drivers.alr import run_alr, alr_pin, alr_unpin, init_local_crate
 from drivers.asserts import assert_match
-from drivers.helpers import git_branch, init_git_repo
-from e3.os.fs import touch
+from drivers.helpers import git_branch, git_commit_file, init_git_repo
 
 import re
 import os
@@ -21,9 +20,7 @@
 
 # Create a second branch and commit for testing
 subprocess.run(["git", "checkout", "-b", "devel"]).check_returncode()
-touch("telltale")
-subprocess.run(["git", "add", "telltale"]).check_returncode()
-subprocess.run(["git", "commit", "-m", "branching"]).check_returncode()
+git_commit_file(commit_name="branching", path="telltale", content="")
 os.chdir("..")
 
 # Now pin to the branch, and verify the telltale file exists in the checkout

diff --git a/testsuite/tests/pin/conflicting-remote/test.py b/testsuite/tests/pin/conflicting-remote/test.py
@@ -4,8 +4,7 @@
 
 from drivers.alr import run_alr, alr_pin, alr_unpin, init_local_crate
 from drivers.asserts import assert_eq, assert_match
-from drivers.helpers import git_blast, git_head, init_git_repo
-from e3.os.fs import touch
+from drivers.helpers import git_blast, git_commit_file, git_head, init_git_repo
 from re import escape
 
 import re
@@ -23,10 +22,7 @@
 
 # Create a second branch and commit for testing
 subprocess.run(["git", "checkout", "-b", "devel"]).check_returncode()
-touch("x")
-subprocess.run(["git", "add", "x"]).check_returncode()
-subprocess.run(["git", "commit", "-m", "branching"]).check_returncode()
-head2 = git_head()
+head2 = git_commit_file(commit_name="branching", path="x", content="")
 os.chdir("..")