mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-30 08:44:31 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
23 lines
839 B
Diff
23 lines
839 B
Diff
diff --git a/tests/cli/test_run.py b/tests/cli/test_run.py
|
|
index 1452cfd..0a21c09 100644
|
|
--- a/tests/cli/test_run.py
|
|
+++ b/tests/cli/test_run.py
|
|
@@ -240,7 +240,7 @@ def test_main_multiple_autohide_options(
|
|
|
|
captured = capsys.readouterr()
|
|
lines = captured.err.strip("\n")
|
|
- lines = lines.split("pytest: ", 1)[1]
|
|
+ lines = lines.split("__main__.py: ", 1)[1]
|
|
expected = f"error: argument {options[1]}: not allowed with argument {options[0]}"
|
|
assert lines == expected
|
|
|
|
@@ -277,7 +277,7 @@ def test_main_multiple_notify_options(
|
|
|
|
captured = capsys.readouterr()
|
|
lines = captured.err.strip("\n")
|
|
- lines = lines.split("pytest: ", 1)[1]
|
|
+ lines = lines.split("__main__.py: ", 1)[1]
|
|
expected = f"error: argument {options[1]}: not allowed with argument {options[0]}"
|
|
assert lines == expected
|
|
|