chore: reflect account migration
Change-Id: Iee327470932e58707473e876982cf22b392c2efa
This commit is contained in:
@@ -103,9 +103,7 @@ def test_parallel_same(nix: Nix):
|
||||
nix.nix_build(["fixed.nix", "-A", "parallelSame", "--no-out-link", "-j2"]).run().ok()
|
||||
|
||||
|
||||
@pytest.mark.skip(
|
||||
"TODO(Commentator2.0, 2025-10): Doesn't work for some reason, f1 test is kept for now"
|
||||
)
|
||||
@pytest.mark.skip("TODO(rootile, 2025-10): Doesn't work for some reason, f1 test is kept for now")
|
||||
@with_files(get_global_asset_pack("fixed"))
|
||||
def test_same_as_add(nix: Nix, files: Path):
|
||||
"""
|
||||
|
||||
@@ -43,7 +43,7 @@ def nix_command_feature(nix: Nix):
|
||||
# "flakes" seems to be the feature actually responsible for
|
||||
# resolving the completions correctly
|
||||
#
|
||||
# Commentator2.0: no clue why...
|
||||
# rootile: no clue why...
|
||||
nix.settings.feature("nix-command", "flakes")
|
||||
|
||||
|
||||
|
||||
@@ -85,7 +85,7 @@ def tar_hash(files: Path, nix: Nix) -> str:
|
||||
],
|
||||
)
|
||||
def test_fetch_tarball(nix: Nix, tarball: Path, tar_hash: str, flags: list[str]):
|
||||
# HACK(Commentator2.0): if we don't create a copy, we'd try to format it twice, as it is the same list used in other test calls
|
||||
# HACK(rootile): if we don't create a copy, we'd try to format it twice, as it is the same list used in other test calls
|
||||
flags = flags[:]
|
||||
|
||||
flags[-1] = flags[-1].format(tarball=tarball, tar_hash=tar_hash)
|
||||
|
||||
@@ -27,9 +27,7 @@ def test_nix_path(env: ManagedEnv, nix: Nix, prefix: str):
|
||||
assert path == expected_path
|
||||
|
||||
|
||||
@pytest.mark.skip(
|
||||
"FIXME(Commentator2.0): for some reason the channel cannot be resolved on the builders"
|
||||
)
|
||||
@pytest.mark.skip("FIXME(rootile): for some reason the channel cannot be resolved on the builders")
|
||||
def test_nix_path_nixpkgs(env: ManagedEnv, nix: Nix):
|
||||
env.set_env(
|
||||
"NIX_PATH",
|
||||
|
||||
@@ -57,7 +57,7 @@ def _cleanup_output(stdout: str, stderr: str, origin: Path) -> tuple[str, str]:
|
||||
def test_parse_okay(files: Path, nix: Nix, flags: list[str], snapshot: Callable[[str], Snapshot]):
|
||||
nix_command = nix.nix_instantiate(
|
||||
["--parse", *flags, files / "in.nix"],
|
||||
# TODO(Commentator2.0): Mirrors behavior of init.sh from functional
|
||||
# TODO(rootile): Mirrors behavior of init.sh from functional
|
||||
# keep this for migration, but make it declarative afterwards
|
||||
# and only active for the tests which need it
|
||||
flake=True,
|
||||
|
||||
@@ -73,7 +73,7 @@ class NixSettings:
|
||||
# FIXME(Jade): #953 this is annoying in the CLI too, we should fix it!
|
||||
|
||||
def serialise(value: Any) -> str:
|
||||
# TODO(Commentator2.0): why exactly are ints supported?
|
||||
# TODO(rootile): why exactly are ints supported?
|
||||
if is_value_of_type(value, set[str | int] | list[str | int]):
|
||||
return " ".join(serialise(e) for e in value)
|
||||
if is_value_of_type(value, str | int):
|
||||
@@ -145,7 +145,7 @@ class Nix:
|
||||
settings = dataclasses.replace(self.settings)
|
||||
if flake:
|
||||
settings.feature("nix-command", "flakes")
|
||||
# FIXME(Commentator2.0): Darwin needs special handling here, as it does not support (non-root) chroots...
|
||||
# FIXME(rootile): Darwin needs special handling here, as it does not support (non-root) chroots...
|
||||
# Hence, it cannot build using a relocated store so we just use the local (aka global) store instead
|
||||
# This is kinda ugly but what else can one do
|
||||
if sys.platform == "darwin":
|
||||
|
||||
Reference in New Issue
Block a user