Skip to content
Snippets Groups Projects
Unverified Commit c8763a63 authored by Oliver Smith's avatar Oliver Smith
Browse files

Revert "test: conftest: adjust pmaports fixture (MR 2477)" (MR 2482)

This caused a regression in CI tests.
This reverts commit b888ddde.

Related: issue 2497
parent 6ee82740
Branches
No related tags found
No related merge requests found
......@@ -161,14 +161,14 @@ def pmaports(pmb_args, monkeypatch):
config = get_context().config
if Config.aports[-1].exists():
pmb.config.git_repos["pmaports"] = [str(Config.aports[-1])]
with monkeypatch.context() as m:
# Speed things up by cloning from the local checkout if it exists.
if Config.aports[0].exists():
m.setitem(pmb.config.git_repos, "pmaports", Config.aports)
if not config.aports[-1].exists():
pmb.helpers.git.clone("pmaports")
assert (
pmb.helpers.run.user(["git", "checkout", "master"], working_dir=config.aports[0]) == 0
)
assert pmb.helpers.run.user(["git", "checkout", "master"], working_dir=config.aports[0]) == 0
@pytest.fixture
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment