guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c493fb668ef4e7f5d86fba3eb12e2effa0159c63
lix/tests/functional2/lang
T
History
Rebecca Turnerandrootile cb34b56fea tests/functional2: Fix Python LSP by adjusting imports 
See: cl/4840

When importing Python modules, we include `functional2` in the module
path, like this:

    from functional2.testlib.fixtures.env import ManagedEnv

This means that python expects to see a file like
`functional2/testlib/fixtures/env.py`. We run `pytest` from `tests/` in
the `justfile` and have `tests/functional2/__init__.py` so `pytest` in
`meson` is able to find these imports.

However, language servers generally consider the `pyproject.toml` to be
the project root, so (e.g.) `pyright` is unable to follow any of the
`functional2` imports, leading to lots of spurious errors.

In cl/4840 I moved `tests/functional2/pyproject.toml` to
`tests/pyproject.toml`, which worked but was considered aesthetically
unappealing.

This diff is much larger but it's a more elegant solution.

Change-Id: I2983c7b87f88f59a4e3521451a9f5acd6a6a6964
2026-01-23 15:06:51 +01:00
..
__functor
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
arithmetic
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
assert
tests/functional2/lang: Migrate trivial eval-fail tests
2025-06-02 21:52:34 +02:00
assets/test_lang_infra
parser: improve error message for missing } in attrset
2025-11-25 19:50:24 +00:00
attrs
libexpr/eval: Refactor force* and eval*, introduce check*
2026-01-03 22:37:20 +01:00
attrs-__overrides
tests/functional2/lang: Migrate attrs tests
2025-11-18 13:48:32 +00:00
attrs-dynamic
tests/functional2/lang: Migrate attrs tests
2025-11-18 13:48:32 +00:00
bad_string_interpolation
tests/functional2/lang: migrated first tests
2025-06-01 20:19:37 +02:00
blackhole
tests/functional2/lang: Migrate trivial eval-fail tests
2025-06-02 21:52:34 +02:00
builtins
tests/functional2/lang: Migrate more builtins
2025-11-18 13:48:32 +00:00
builtins.abort
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.add
tests/functional2/lang: Migrate more builtins
2025-11-18 13:48:32 +00:00
builtins.addDrvOutputDependencies
tests/functional2/lang: Migrate builtins.addDrvOutputDependencies
2025-11-18 19:45:15 +01:00
builtins.any-all
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.attrNames-getAttr-attrValues
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.catAttrs
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.compareVersions-parseDrvName
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
builtins.concatMap
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.concatStringsSep
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.deepSeq
tests/functional2/lang: Migrate builtins.deepSeq test
2025-09-18 23:38:46 +02:00
builtins.derivationStrict
tests/functional2/lang: Migrate builtins.derivationStrict
2025-11-18 19:45:15 +01:00
builtins.elem
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.fetchtree
tests/functional2/lang: Move some tests around
2025-11-24 16:31:29 +01:00
builtins.filter
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.flakeRefToString
tests/functional2/lang: Move some tests around
2025-11-24 16:31:29 +01:00
builtins.floor-ceil
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
builtins.foldl'
tests/functional2/lang: Migrate builtins.foldl'
2025-11-17 22:10:11 +00:00
builtins.fromJSON
tests/functional2/lang: Migrate builtins.fromJSON
2025-11-17 22:10:11 +00:00
builtins.fromTOML
tests/functional2/lang: Migrate builtins.fromTOML
2025-11-17 22:10:11 +00:00
builtins.genericClosure
tests/functional2/lang: Migrate more builtins
2025-11-18 13:48:32 +00:00
builtins.getEnv
tests/functional2: Fix Python LSP by adjusting imports
2026-01-23 15:06:51 +01:00
builtins.groupBy
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.hashFile
tests/functional2/lang: Migrate builtins.hashFile tests
2025-11-17 22:10:11 +00:00
builtins.hashString
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.intersectAttrs
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.listToAttrs
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
builtins.map
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
builtins.mapAttrs
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.matches
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.parseFlakeRef
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.partition
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.path
tests/functional2/lang: Migrate builtins.path
2025-11-17 22:10:11 +00:00
builtins.pathExists
tests/functional2: Fix Python LSP by adjusting imports
2026-01-23 15:06:51 +01:00
builtins.readDir
tests/functional2: Fix Python LSP by adjusting imports
2026-01-23 15:06:51 +01:00
builtins.readFile
tests/functional2/lang: Migrate builtins.readFile
2025-11-17 22:10:11 +00:00
builtins.readFileType
tests/functional2: Fix Python LSP by adjusting imports
2026-01-23 15:06:51 +01:00
builtins.removeAttrs
tests/functional2/lang: Migrate more builtins
2025-11-18 13:48:32 +00:00
builtins.replaceStrings
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.seq
tests/functional2/lang: Migrate builtins.seq
2025-11-17 22:10:11 +00:00
builtins.sort
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.split
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.splitVersion
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.substring
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
builtins.throw
tests/functional2/lang: Move some tests around
2025-11-24 16:31:29 +01:00
builtins.toJSON
*: wrap nlohmann exceptions at the source
2026-01-04 16:25:06 +00:00
builtins.toPath
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.toString
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.toXML
tests/functional2/lang: Migrate builtins.toXML
2025-11-17 22:10:11 +00:00
builtins.tryEval
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
builtins.unsafeGetAttrPos
tests/functional2/lang: Migrate builtins.unsafeGetAttrPos tests
2025-11-17 22:10:11 +00:00
builtins.warn
new option: abort-on-warn
2025-11-22 16:48:53 +01:00
builtins.zipAttrsWith
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
call-primop
libexpr: fix app chain extension
2026-01-14 22:05:16 +00:00
comments
tests/functional2/lang: Migrate trivial eval-okay tests
2025-06-02 21:52:34 +02:00
concat
tests/functional2/lang: More trivial eval-okay test migrations
2025-09-18 23:38:46 +02:00
curpos
tests/functional2/lang: Migrate trivial eval-okay tests
2025-06-02 21:52:34 +02:00
drv-trace-summary
libexpr/eval: Refactor force* and eval*, introduce check*
2026-01-03 22:37:20 +01:00
duplicate-traces
tests/functional2/lang: Migrate trivial eval-fail tests
2025-06-02 21:52:34 +02:00
eq
libstore: bring back some pointer equality nonsense
2025-11-14 02:56:53 +00:00
err_context
tests/functional2: Fix Python LSP by adjusting imports
2026-01-23 15:06:51 +01:00
eval-xml
tests/functional2/lang: Migrate eval-okay-xml
2025-11-18 19:52:17 +01:00
float
tests/functional2/lang: Migrate trivial eval-okay tests
2025-06-02 21:52:34 +02:00
function-args
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
function-autoargs
tests/functional2/lang: Migrate attrs tests
2025-11-18 13:48:32 +00:00
function-recursion
tests/functional2/lang: Move some tests around
2025-11-24 16:31:29 +01:00
if
tests/functional2/lang: Migrate trivial eval-okay tests
2025-06-02 21:52:34 +02:00
import
tests/functional2/lang: improve toml design
2025-06-20 11:36:13 +02:00
inherit
parser: improve error message for missing semicolon in inherit
2025-11-22 16:48:53 +01:00
inherit-from
tests/functional2/lang: Migrate inherit tests
2025-09-18 23:38:46 +02:00
let
parser: improve error message for missing semicolon in let/{}
2025-11-25 19:50:24 +00:00
line-endings-crlf
tests/functional2/lang: Migrate eol tests
2025-11-17 22:10:11 +00:00
list
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
logic
tests/functional2/lang: Migrate trivial eval-okay tests
2025-06-02 21:52:34 +02:00
nul_bytes
tests/functional2/lang: improve toml design
2025-06-20 11:36:13 +02:00
nul_bytes_parsers
libexpr: use pascal strings for eval
2025-10-11 12:57:57 +02:00
parser-eof
tests/functional2/lang: Migrate eof tests
2025-11-17 22:10:11 +00:00
parser-merge-attrs
nix::parser::State::addAttr: Deep attribute merging
2025-11-24 19:16:27 +00:00
parser-output-json
tests/functional2/lang: Rename tests
2025-09-18 23:38:46 +02:00
path
tests/functional2/lang: Move some tests around
2025-11-24 16:31:29 +01:00
rec-set-overrides
tests/functional2/lang: Migrate rec-set-overrides tests
2025-11-17 22:10:11 +00:00
recursion
tests/functional2/lang: Migrate trivial eval-fail tests
2025-06-02 21:52:34 +02:00
redefine-builtin
tests/functional2/lang: Migrate trivial eval-okay tests
2025-06-02 21:52:34 +02:00
regression-751
tests/functional2/lang: Migrate trivial parse-okay tests
2025-06-02 21:52:34 +02:00
regression-20041027
tests/functional2/lang: Migrate another weird regression test
2025-11-17 22:10:11 +00:00
regression-20060610
tests/functional2/lang: Migrate trivial parse-fail tests
2025-06-02 21:52:34 +02:00
regression-20220122
tests/functional2/lang: Migrate trivial eval-okay tests
2025-06-02 21:52:34 +02:00
regression-20220125
tests/functional2/lang: Migrate trivial eval-okay tests
2025-06-02 21:52:34 +02:00
scope
tests/functional2/lang: migrated first tests
2025-06-01 20:19:37 +02:00
search-path
tests/functional2: Fix Python LSP by adjusting imports
2026-01-23 15:06:51 +01:00
select-err
tests/functional2/lang: Migrate trivial eval-fail tests
2025-06-02 21:52:34 +02:00
set
tests/functional2/lang: Merge tests
2025-11-17 22:10:11 +00:00
string
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
string-coerce-integers
tests/functional2/lang: Migrate string coersion for integers
2025-11-18 19:45:15 +01:00
string-context
tests/functional2/lang: Migrate string-context tests
2025-11-18 13:48:32 +00:00
string-indented
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
subversion
tests/functional2/lang: Migrate trivial parse-okay tests
2025-06-02 21:52:34 +02:00
types
tests/functional2/lang: Migrate trivial eval-okay tests
2025-06-02 21:52:34 +02:00
undefined-var
tests/functional2/lang: Migrate undefined-var tests
2025-11-17 22:10:11 +00:00
url-literals
tests/functional2/lang: Migrate url-literals test
2025-11-17 22:10:11 +00:00
utf8
libexpr: AST-dump non-utf8 strings as byte arrays
2025-12-01 21:11:25 +01:00
value-printer
tests/functional2/lang: Migrate eval-okay-print
2025-11-17 22:10:11 +00:00
with
tests/functional2/lang: Refactor test outputs
2025-11-24 16:31:29 +01:00
__init__.py
tests/functional2: add framework for lang tests
2025-06-01 20:19:37 +02:00
lang_util.py
tests/functional2: Fix Python LSP by adjusting imports
2026-01-23 15:06:51 +01:00
lib.nix
tests/functional: remove the now fully migrated lang framework
2025-11-21 17:02:35 +00:00
OWNERS
OWNERS: fix some wrong emails
2025-07-17 12:36:54 -07:00
test_lang_infra.py
tests/functional2: Fix Python LSP by adjusting imports
2026-01-23 15:06:51 +01:00
test_lang.py
tests/functional2: Fix Python LSP by adjusting imports
2026-01-23 15:06:51 +01:00