psi-jack/yadm
1
0
Fork 0
mirror of synced 2024-12-21 22:21:08 -05:00
Code Issues Releases Wiki Activity

Fix test_upgrade when running outside of docker image

Browse source 
E.g. direct on github runner.
This commit is contained in:
Erik Flodin 2024-11-24 20:40:06 +01:00
parent 3093460d41
commit 24772e7b4b
No known key found for this signature in database
GPG key ID: 420A7C865EE3F85F
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/test_upgrade.py
View file

@ -19,13 +19,15 @@ import pytest
], ],
) )
@pytest.mark.parametrize("submodule", [False, True], ids=["no submodule", "with submodules"]) @pytest.mark.parametrize("submodule", [False, True], ids=["no submodule", "with submodules"])
def test_upgrade(tmpdir, runner, versions, submodule): def test_upgrade(tmpdir, runner, paths, versions, submodule):
"""Upgrade tests""" """Upgrade tests"""
# pylint: disable=too-many-statements # pylint: disable=too-many-statements
home = tmpdir.mkdir("HOME") home = tmpdir.mkdir("HOME")
env = {"HOME": str(home)} env = {"HOME": str(home)}
runner(["git", "config", "--global", "init.defaultBranch", "master"], env=env) runner(["git", "config", "--global", "init.defaultBranch", "master"], env=env)
runner(["git", "config", "--global", "protocol.file.allow", "always"], env=env) runner(["git", "config", "--global", "protocol.file.allow", "always"], env=env)
runner(["git", "config", "--global", "user.email", "test@yadm.io"], env=env)
runner(["git", "config", "--global", "user.name", "Yadm Test"], env=env)
if submodule: if submodule:
ext_repo = tmpdir.mkdir("ext_repo") ext_repo = tmpdir.mkdir("ext_repo")
@ -39,7 +41,7 @@ def test_upgrade(tmpdir, runner, versions, submodule):
os.environ.pop("XDG_DATA_HOME", None) os.environ.pop("XDG_DATA_HOME", None)
def run_version(version, *args, check_stderr=True): def run_version(version, *args, check_stderr=True):
yadm = f"yadm-{version}" if version else "/yadm/yadm" yadm = f"yadm-{version}" if version else paths.pgm
run = runner([yadm, *args], shell=True, cwd=str(home), env=env) run = runner([yadm, *args], shell=True, cwd=str(home), env=env)
assert run.success assert run.success
if check_stderr: if check_stderr: