forked from Mirror/pmbootstrap
WIP: start ripping out args (MR 2252)
Cease merging pmbootstrap.cfg into args, implement a Context type to let us pull globals out of thin air (as an intermediate workaround) and rip args out of a lot of the codebase. This is just a first pass, after this we can split all the state that leaked over into Context into types with narrower scopes (like a BuildContext(), etc). Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
parent
bfea00e03a
commit
34dd9d42ba
129 changed files with 1393 additions and 1300 deletions
|
@ -2,7 +2,7 @@
|
|||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
""" Test pmb/chroot/mount.py """
|
||||
import os
|
||||
from pmb.core.types import PmbArgs
|
||||
from pmb.types import PmbArgs
|
||||
import pytest
|
||||
import sys
|
||||
|
||||
|
@ -15,7 +15,7 @@ def args(tmpdir, request):
|
|||
import pmb.parse
|
||||
sys.argv = ["pmbootstrap", "init"]
|
||||
args = pmb.parse.arguments()
|
||||
args.log = pmb.config.work / "log_testsuite.txt"
|
||||
args.log = get_context().config.work / "log_testsuite.txt"
|
||||
pmb.helpers.logging.init(args)
|
||||
request.addfinalizer(pmb.helpers.logging.logfd.close)
|
||||
return args
|
||||
|
@ -26,7 +26,7 @@ def test_chroot_mount(args: PmbArgs):
|
|||
mnt_dir = chroot / "mnt/pmbootstrap"
|
||||
|
||||
# Run something in the chroot to have the dirs created
|
||||
pmb.chroot.root(args, ["true"])
|
||||
pmb.chroot.root(["true"])
|
||||
assert mnt_dir.exists()
|
||||
assert (mnt_dir / "packages").exists()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue