From f2b64142a9daf37a5600fd0fe49ac5cb6a210dc2 Mon Sep 17 00:00:00 2001 From: piegames Date: Fri, 6 Jun 2025 19:09:40 +0200 Subject: [PATCH] tests/functional2/lang: Migrate dup-attrs tests Change-Id: Ia5976229c8b2e6bf89d821b5676a9a397e4539d7 --- tests/functional/lang/eval-fail-dupAttr-deep.err.exp | 5 ----- tests/functional/lang/eval-fail-dupAttr-inherit.err.exp | 5 ----- tests/functional/lang/eval-fail-dupAttr.err.exp | 5 ----- tests/functional/lang/parse-fail-dup-attrs-1.err.exp | 6 ------ tests/functional/lang/parse-fail-dup-attrs-2.err.exp | 6 ------ tests/functional/lang/parse-fail-dup-attrs-3.err.exp | 6 ------ tests/functional/lang/parse-fail-dup-attrs-4.err.exp | 6 ------ tests/functional/lang/parse-fail-dup-attrs-7.err.exp | 6 ------ tests/functional2/lang/dup-attrs/eval-fail-deep.err.exp | 5 +++++ .../lang/dup-attrs/eval-fail-dynamic-attrs.err.exp} | 6 +++--- tests/functional2/lang/dup-attrs/eval-fail-inherit.err.exp | 5 +++++ tests/functional2/lang/dup-attrs/eval-fail.err.exp | 5 +++++ .../lang/dup-attrs/in-1.nix} | 0 .../lang/dup-attrs/in-2.nix} | 0 .../lang/dup-attrs/in-3.nix} | 0 .../lang/dup-attrs/in-4.nix} | 0 .../lang/dup-attrs/in-5.nix} | 0 .../lang/dup-attrs/in-6.nix} | 0 .../lang/dup-attrs/in-7.nix} | 0 .../lang/dup-attrs/in-deep.nix} | 0 .../lang/dup-attrs/in-dynamic-attrs.nix} | 0 .../lang/dup-attrs/in-inherit.nix} | 0 .../lang/dup-attrs/in.nix} | 0 tests/functional2/lang/dup-attrs/parse-fail-1.err.exp | 6 ++++++ tests/functional2/lang/dup-attrs/parse-fail-2.err.exp | 6 ++++++ tests/functional2/lang/dup-attrs/parse-fail-3.err.exp | 6 ++++++ tests/functional2/lang/dup-attrs/parse-fail-4.err.exp | 6 ++++++ tests/functional2/lang/dup-attrs/parse-fail-7.err.exp | 6 ++++++ .../lang/dup-attrs/parse-okay-5.out.exp} | 0 .../lang/dup-attrs/parse-okay-6.out.exp} | 0 30 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 tests/functional/lang/eval-fail-dupAttr-deep.err.exp delete mode 100644 tests/functional/lang/eval-fail-dupAttr-inherit.err.exp delete mode 100644 tests/functional/lang/eval-fail-dupAttr.err.exp delete mode 100644 tests/functional/lang/parse-fail-dup-attrs-1.err.exp delete mode 100644 tests/functional/lang/parse-fail-dup-attrs-2.err.exp delete mode 100644 tests/functional/lang/parse-fail-dup-attrs-3.err.exp delete mode 100644 tests/functional/lang/parse-fail-dup-attrs-4.err.exp delete mode 100644 tests/functional/lang/parse-fail-dup-attrs-7.err.exp create mode 100644 tests/functional2/lang/dup-attrs/eval-fail-deep.err.exp rename tests/{functional/lang/eval-fail-dup-dynamic-attrs.err.exp => functional2/lang/dup-attrs/eval-fail-dynamic-attrs.err.exp} (61%) create mode 100644 tests/functional2/lang/dup-attrs/eval-fail-inherit.err.exp create mode 100644 tests/functional2/lang/dup-attrs/eval-fail.err.exp rename tests/{functional/lang/parse-fail-dup-attrs-1.nix => functional2/lang/dup-attrs/in-1.nix} (100%) rename tests/{functional/lang/parse-fail-dup-attrs-2.nix => functional2/lang/dup-attrs/in-2.nix} (100%) rename tests/{functional/lang/parse-fail-dup-attrs-3.nix => functional2/lang/dup-attrs/in-3.nix} (100%) rename tests/{functional/lang/parse-fail-dup-attrs-4.nix => functional2/lang/dup-attrs/in-4.nix} (100%) rename tests/{functional/lang/parse-okay-dup-attrs-5.nix => functional2/lang/dup-attrs/in-5.nix} (100%) rename tests/{functional/lang/parse-okay-dup-attrs-6.nix => functional2/lang/dup-attrs/in-6.nix} (100%) rename tests/{functional/lang/parse-fail-dup-attrs-7.nix => functional2/lang/dup-attrs/in-7.nix} (100%) rename tests/{functional/lang/eval-fail-dupAttr-deep.nix => functional2/lang/dup-attrs/in-deep.nix} (100%) rename tests/{functional/lang/eval-fail-dup-dynamic-attrs.nix => functional2/lang/dup-attrs/in-dynamic-attrs.nix} (100%) rename tests/{functional/lang/eval-fail-dupAttr-inherit.nix => functional2/lang/dup-attrs/in-inherit.nix} (100%) rename tests/{functional/lang/eval-fail-dupAttr.nix => functional2/lang/dup-attrs/in.nix} (100%) create mode 100644 tests/functional2/lang/dup-attrs/parse-fail-1.err.exp create mode 100644 tests/functional2/lang/dup-attrs/parse-fail-2.err.exp create mode 100644 tests/functional2/lang/dup-attrs/parse-fail-3.err.exp create mode 100644 tests/functional2/lang/dup-attrs/parse-fail-4.err.exp create mode 100644 tests/functional2/lang/dup-attrs/parse-fail-7.err.exp rename tests/{functional/lang/parse-okay-dup-attrs-5.exp => functional2/lang/dup-attrs/parse-okay-5.out.exp} (100%) rename tests/{functional/lang/parse-okay-dup-attrs-6.exp => functional2/lang/dup-attrs/parse-okay-6.out.exp} (100%) diff --git a/tests/functional/lang/eval-fail-dupAttr-deep.err.exp b/tests/functional/lang/eval-fail-dupAttr-deep.err.exp deleted file mode 100644 index 2190798c3..000000000 --- a/tests/functional/lang/eval-fail-dupAttr-deep.err.exp +++ /dev/null @@ -1,5 +0,0 @@ -error: attribute 'a.b.c' already defined at /pwd/eval-fail-dupAttr-deep.nix:1:3 - at /pwd/eval-fail-dupAttr-deep.nix:1:14: - 1| { a.b.c = 1; a.b.c.a.a = 1; } - | ^ - 2| diff --git a/tests/functional/lang/eval-fail-dupAttr-inherit.err.exp b/tests/functional/lang/eval-fail-dupAttr-inherit.err.exp deleted file mode 100644 index eee13092f..000000000 --- a/tests/functional/lang/eval-fail-dupAttr-inherit.err.exp +++ /dev/null @@ -1,5 +0,0 @@ -error: attribute 'a' already defined at /pwd/eval-fail-dupAttr-inherit.nix:1:16 - at /pwd/eval-fail-dupAttr-inherit.nix:1:19: - 1| { inherit ({}) a; a.b = 1; } - | ^ - 2| diff --git a/tests/functional/lang/eval-fail-dupAttr.err.exp b/tests/functional/lang/eval-fail-dupAttr.err.exp deleted file mode 100644 index f93292eb5..000000000 --- a/tests/functional/lang/eval-fail-dupAttr.err.exp +++ /dev/null @@ -1,5 +0,0 @@ -error: attribute 'a' already defined at /pwd/eval-fail-dupAttr.nix:1:3 - at /pwd/eval-fail-dupAttr.nix:1:10: - 1| { a = 1; a.b = 1; } - | ^ - 2| diff --git a/tests/functional/lang/parse-fail-dup-attrs-1.err.exp b/tests/functional/lang/parse-fail-dup-attrs-1.err.exp deleted file mode 100644 index 70fb226be..000000000 --- a/tests/functional/lang/parse-fail-dup-attrs-1.err.exp +++ /dev/null @@ -1,6 +0,0 @@ -error: attribute 'x' already defined at /pwd/parse-fail-dup-attrs-1.nix:1:3 - at /pwd/parse-fail-dup-attrs-1.nix:3:3: - 2| y = 456; - 3| x = 789; - | ^ - 4| } diff --git a/tests/functional/lang/parse-fail-dup-attrs-2.err.exp b/tests/functional/lang/parse-fail-dup-attrs-2.err.exp deleted file mode 100644 index 124284bc9..000000000 --- a/tests/functional/lang/parse-fail-dup-attrs-2.err.exp +++ /dev/null @@ -1,6 +0,0 @@ -error: attribute 'x' already defined at /pwd/parse-fail-dup-attrs-2.nix:9:5 - at /pwd/parse-fail-dup-attrs-2.nix:10:18: - 9| x = 789; - 10| inherit (as) x; - | ^ - 11| }; diff --git a/tests/functional/lang/parse-fail-dup-attrs-3.err.exp b/tests/functional/lang/parse-fail-dup-attrs-3.err.exp deleted file mode 100644 index 688ade4b8..000000000 --- a/tests/functional/lang/parse-fail-dup-attrs-3.err.exp +++ /dev/null @@ -1,6 +0,0 @@ -error: attribute 'x' already defined at /pwd/parse-fail-dup-attrs-3.nix:9:5 - at /pwd/parse-fail-dup-attrs-3.nix:10:18: - 9| x = 789; - 10| inherit (as) x; - | ^ - 11| }; diff --git a/tests/functional/lang/parse-fail-dup-attrs-4.err.exp b/tests/functional/lang/parse-fail-dup-attrs-4.err.exp deleted file mode 100644 index 97acf214a..000000000 --- a/tests/functional/lang/parse-fail-dup-attrs-4.err.exp +++ /dev/null @@ -1,6 +0,0 @@ -error: attribute 'services.ssh.port' already defined at /pwd/parse-fail-dup-attrs-4.nix:2:3 - at /pwd/parse-fail-dup-attrs-4.nix:3:3: - 2| services.ssh.port = 22; - 3| services.ssh.port = 23; - | ^ - 4| } diff --git a/tests/functional/lang/parse-fail-dup-attrs-7.err.exp b/tests/functional/lang/parse-fail-dup-attrs-7.err.exp deleted file mode 100644 index ae4a37ee8..000000000 --- a/tests/functional/lang/parse-fail-dup-attrs-7.err.exp +++ /dev/null @@ -1,6 +0,0 @@ -error: attribute 'x' already defined at /pwd/parse-fail-dup-attrs-7.nix:6:13 - at /pwd/parse-fail-dup-attrs-7.nix:7:13: - 6| inherit x; - 7| inherit x; - | ^ - 8| }; diff --git a/tests/functional2/lang/dup-attrs/eval-fail-deep.err.exp b/tests/functional2/lang/dup-attrs/eval-fail-deep.err.exp new file mode 100644 index 000000000..66db2ed33 --- /dev/null +++ b/tests/functional2/lang/dup-attrs/eval-fail-deep.err.exp @@ -0,0 +1,5 @@ +error: attribute 'a.b.c' already defined at /pwd/in.nix:1:3 + at /pwd/in.nix:1:14: + 1| { a.b.c = 1; a.b.c.a.a = 1; } + | ^ + 2| diff --git a/tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp b/tests/functional2/lang/dup-attrs/eval-fail-dynamic-attrs.err.exp similarity index 61% rename from tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp rename to tests/functional2/lang/dup-attrs/eval-fail-dynamic-attrs.err.exp index 412b5204e..042c7c1f9 100644 --- a/tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp +++ b/tests/functional2/lang/dup-attrs/eval-fail-dynamic-attrs.err.exp @@ -1,13 +1,13 @@ error: … while evaluating the attribute 'set' - at /pwd/eval-fail-dup-dynamic-attrs.nix:2:3: + at /pwd/in.nix:2:3: 1| { 2| set = { "${"" + "b"}" = 1; }; | ^ 3| set = { "${"b" + ""}" = 2; }; - error: dynamic attribute 'b' already defined at /pwd/eval-fail-dup-dynamic-attrs.nix:2:11 - at /pwd/eval-fail-dup-dynamic-attrs.nix:3:11: + error: dynamic attribute 'b' already defined at /pwd/in.nix:2:11 + at /pwd/in.nix:3:11: 2| set = { "${"" + "b"}" = 1; }; 3| set = { "${"b" + ""}" = 2; }; | ^ diff --git a/tests/functional2/lang/dup-attrs/eval-fail-inherit.err.exp b/tests/functional2/lang/dup-attrs/eval-fail-inherit.err.exp new file mode 100644 index 000000000..21652862e --- /dev/null +++ b/tests/functional2/lang/dup-attrs/eval-fail-inherit.err.exp @@ -0,0 +1,5 @@ +error: attribute 'a' already defined at /pwd/in.nix:1:16 + at /pwd/in.nix:1:19: + 1| { inherit ({}) a; a.b = 1; } + | ^ + 2| diff --git a/tests/functional2/lang/dup-attrs/eval-fail.err.exp b/tests/functional2/lang/dup-attrs/eval-fail.err.exp new file mode 100644 index 000000000..cbe794885 --- /dev/null +++ b/tests/functional2/lang/dup-attrs/eval-fail.err.exp @@ -0,0 +1,5 @@ +error: attribute 'a' already defined at /pwd/in.nix:1:3 + at /pwd/in.nix:1:10: + 1| { a = 1; a.b = 1; } + | ^ + 2| diff --git a/tests/functional/lang/parse-fail-dup-attrs-1.nix b/tests/functional2/lang/dup-attrs/in-1.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-1.nix rename to tests/functional2/lang/dup-attrs/in-1.nix diff --git a/tests/functional/lang/parse-fail-dup-attrs-2.nix b/tests/functional2/lang/dup-attrs/in-2.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-2.nix rename to tests/functional2/lang/dup-attrs/in-2.nix diff --git a/tests/functional/lang/parse-fail-dup-attrs-3.nix b/tests/functional2/lang/dup-attrs/in-3.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-3.nix rename to tests/functional2/lang/dup-attrs/in-3.nix diff --git a/tests/functional/lang/parse-fail-dup-attrs-4.nix b/tests/functional2/lang/dup-attrs/in-4.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-4.nix rename to tests/functional2/lang/dup-attrs/in-4.nix diff --git a/tests/functional/lang/parse-okay-dup-attrs-5.nix b/tests/functional2/lang/dup-attrs/in-5.nix similarity index 100% rename from tests/functional/lang/parse-okay-dup-attrs-5.nix rename to tests/functional2/lang/dup-attrs/in-5.nix diff --git a/tests/functional/lang/parse-okay-dup-attrs-6.nix b/tests/functional2/lang/dup-attrs/in-6.nix similarity index 100% rename from tests/functional/lang/parse-okay-dup-attrs-6.nix rename to tests/functional2/lang/dup-attrs/in-6.nix diff --git a/tests/functional/lang/parse-fail-dup-attrs-7.nix b/tests/functional2/lang/dup-attrs/in-7.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-7.nix rename to tests/functional2/lang/dup-attrs/in-7.nix diff --git a/tests/functional/lang/eval-fail-dupAttr-deep.nix b/tests/functional2/lang/dup-attrs/in-deep.nix similarity index 100% rename from tests/functional/lang/eval-fail-dupAttr-deep.nix rename to tests/functional2/lang/dup-attrs/in-deep.nix diff --git a/tests/functional/lang/eval-fail-dup-dynamic-attrs.nix b/tests/functional2/lang/dup-attrs/in-dynamic-attrs.nix similarity index 100% rename from tests/functional/lang/eval-fail-dup-dynamic-attrs.nix rename to tests/functional2/lang/dup-attrs/in-dynamic-attrs.nix diff --git a/tests/functional/lang/eval-fail-dupAttr-inherit.nix b/tests/functional2/lang/dup-attrs/in-inherit.nix similarity index 100% rename from tests/functional/lang/eval-fail-dupAttr-inherit.nix rename to tests/functional2/lang/dup-attrs/in-inherit.nix diff --git a/tests/functional/lang/eval-fail-dupAttr.nix b/tests/functional2/lang/dup-attrs/in.nix similarity index 100% rename from tests/functional/lang/eval-fail-dupAttr.nix rename to tests/functional2/lang/dup-attrs/in.nix diff --git a/tests/functional2/lang/dup-attrs/parse-fail-1.err.exp b/tests/functional2/lang/dup-attrs/parse-fail-1.err.exp new file mode 100644 index 000000000..e5959efb7 --- /dev/null +++ b/tests/functional2/lang/dup-attrs/parse-fail-1.err.exp @@ -0,0 +1,6 @@ +error: attribute 'x' already defined at /pwd/in.nix:1:3 + at /pwd/in.nix:3:3: + 2| y = 456; + 3| x = 789; + | ^ + 4| } diff --git a/tests/functional2/lang/dup-attrs/parse-fail-2.err.exp b/tests/functional2/lang/dup-attrs/parse-fail-2.err.exp new file mode 100644 index 000000000..178d0e80d --- /dev/null +++ b/tests/functional2/lang/dup-attrs/parse-fail-2.err.exp @@ -0,0 +1,6 @@ +error: attribute 'x' already defined at /pwd/in.nix:9:5 + at /pwd/in.nix:10:18: + 9| x = 789; + 10| inherit (as) x; + | ^ + 11| }; diff --git a/tests/functional2/lang/dup-attrs/parse-fail-3.err.exp b/tests/functional2/lang/dup-attrs/parse-fail-3.err.exp new file mode 100644 index 000000000..178d0e80d --- /dev/null +++ b/tests/functional2/lang/dup-attrs/parse-fail-3.err.exp @@ -0,0 +1,6 @@ +error: attribute 'x' already defined at /pwd/in.nix:9:5 + at /pwd/in.nix:10:18: + 9| x = 789; + 10| inherit (as) x; + | ^ + 11| }; diff --git a/tests/functional2/lang/dup-attrs/parse-fail-4.err.exp b/tests/functional2/lang/dup-attrs/parse-fail-4.err.exp new file mode 100644 index 000000000..c7b730e88 --- /dev/null +++ b/tests/functional2/lang/dup-attrs/parse-fail-4.err.exp @@ -0,0 +1,6 @@ +error: attribute 'services.ssh.port' already defined at /pwd/in.nix:2:3 + at /pwd/in.nix:3:3: + 2| services.ssh.port = 22; + 3| services.ssh.port = 23; + | ^ + 4| } diff --git a/tests/functional2/lang/dup-attrs/parse-fail-7.err.exp b/tests/functional2/lang/dup-attrs/parse-fail-7.err.exp new file mode 100644 index 000000000..8500a0c5b --- /dev/null +++ b/tests/functional2/lang/dup-attrs/parse-fail-7.err.exp @@ -0,0 +1,6 @@ +error: attribute 'x' already defined at /pwd/in.nix:6:13 + at /pwd/in.nix:7:13: + 6| inherit x; + 7| inherit x; + | ^ + 8| }; diff --git a/tests/functional/lang/parse-okay-dup-attrs-5.exp b/tests/functional2/lang/dup-attrs/parse-okay-5.out.exp similarity index 100% rename from tests/functional/lang/parse-okay-dup-attrs-5.exp rename to tests/functional2/lang/dup-attrs/parse-okay-5.out.exp diff --git a/tests/functional/lang/parse-okay-dup-attrs-6.exp b/tests/functional2/lang/dup-attrs/parse-okay-6.out.exp similarity index 100% rename from tests/functional/lang/parse-okay-dup-attrs-6.exp rename to tests/functional2/lang/dup-attrs/parse-okay-6.out.exp