Skip to content

Commit

Permalink
test: Fix shifted source positions after formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@roberth
roberth committed Jan 24, 2025
1 parent 2f1b70a commit ae0bb7d
Show file tree
Hide file tree
Showing 39 changed files with 332 additions and 319 deletions.
10 changes: 5 additions & 5 deletions tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
error:
… while calling the 'addDrvOutputDependencies' builtin
at /pwd/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix:18:4:
17|
18| in builtins.addDrvOutputDependencies combo-path
| ^
19|
at /pwd/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix:25:1:
24| in
25| builtins.addDrvOutputDependencies combo-path
| ^
26|

error: context of string '/nix/store/pg9yqs4yd85yhdm3f4i5dyaqp5jahrsz-fail.drv/nix/store/2dxd5frb715z451vbf7s8birlf3argbk-fail-2.drv' must have exactly one element, but has 2
10 changes: 5 additions & 5 deletions tests/functional/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
error:
… while calling the 'addDrvOutputDependencies' builtin
at /pwd/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix:9:4:
8|
9| in builtins.addDrvOutputDependencies drv.outPath
| ^
10|
at /pwd/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix:13:1:
12| in
13| builtins.addDrvOutputDependencies drv.outPath
| ^
14|

error: `addDrvOutputDependencies` can only act on derivations, not on a derivation output such as 'out'
4 changes: 2 additions & 2 deletions tests/functional/lang/eval-fail-assert-equal-attrs-names-2.err.exp
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
error:
… while evaluating the condition of the assertion '({ a = true; } == { a = true; b = true; })'
at /pwd/lang/eval-fail-assert-equal-attrs-names-2.nix:1:1:
1| assert { a = true; } == { a = true; b = true; };
1| assert
| ^
2| throw "unreachable"
2| {

error: attribute names of attribute set '{ a = true; }' differs from attribute set '{ a = true; b = true; }'
4 changes: 2 additions & 2 deletions tests/functional/lang/eval-fail-assert-equal-attrs-names.err.exp
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
error:
… while evaluating the condition of the assertion '({ a = true; b = true; } == { a = true; })'
at /pwd/lang/eval-fail-assert-equal-attrs-names.nix:1:1:
1| assert { a = true; b = true; } == { a = true; };
1| assert
| ^
2| throw "unreachable"
2| {

error: attribute names of attribute set '{ a = true; b = true; }' differs from attribute set '{ a = true; }'
18 changes: 9 additions & 9 deletions tests/functional/lang/eval-fail-assert-equal-derivations-extra.err.exp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ error:
at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:1:1:
1| assert
| ^
2| { foo = { type = "derivation"; outPath = "/nix/store/0"; }; }
2| {

… while comparing attribute 'foo'

… where left hand side is
at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:2:5:
1| assert
2| { foo = { type = "derivation"; outPath = "/nix/store/0"; }; }
at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:3:5:
2| {
3| foo = {
| ^
3| ==
4| type = "derivation";

… where right hand side is
at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:4:5:
3| ==
4| { foo = { type = "derivation"; outPath = "/nix/store/1"; devious = true; }; };
at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:8:5:
7| } == {
8| foo = {
| ^
5| throw "unreachable"
9| type = "derivation";

… while comparing a derivation by its 'outPath' attribute

Expand Down
18 changes: 9 additions & 9 deletions tests/functional/lang/eval-fail-assert-equal-derivations.err.exp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ error:
at /pwd/lang/eval-fail-assert-equal-derivations.nix:1:1:
1| assert
| ^
2| { foo = { type = "derivation"; outPath = "/nix/store/0"; ignored = abort "not ignored"; }; }
2| {

… while comparing attribute 'foo'

… where left hand side is
at /pwd/lang/eval-fail-assert-equal-derivations.nix:2:5:
1| assert
2| { foo = { type = "derivation"; outPath = "/nix/store/0"; ignored = abort "not ignored"; }; }
at /pwd/lang/eval-fail-assert-equal-derivations.nix:3:5:
2| {
3| foo = {
| ^
3| ==
4| type = "derivation";

… where right hand side is
at /pwd/lang/eval-fail-assert-equal-derivations.nix:4:5:
3| ==
4| { foo = { type = "derivation"; outPath = "/nix/store/1"; ignored = abort "not ignored"; }; };
at /pwd/lang/eval-fail-assert-equal-derivations.nix:9:5:
8| } == {
9| foo = {
| ^
5| throw "unreachable"
10| type = "derivation";

… while comparing a derivation by its 'outPath' attribute

Expand Down
4 changes: 2 additions & 2 deletions tests/functional/lang/eval-fail-assert-equal-function-direct.err.exp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ error:
… while evaluating the condition of the assertion '((x: x) == (x: x))'
at /pwd/lang/eval-fail-assert-equal-function-direct.nix:3:1:
2| # This only compares a direct comparison and makes no claims about functions in nested structures.
3| assert
3| assert (x: x) == (x: x);
| ^
4| (x: x)
4| abort "unreachable"

error: distinct functions and immediate comparisons of identical functions compare as unequal
4 changes: 2 additions & 2 deletions tests/functional/lang/eval-fail-assert-equal-list-length.err.exp
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
error:
… while evaluating the condition of the assertion '([ (1) (0) ] == [ (10) ])'
at /pwd/lang/eval-fail-assert-equal-list-length.nix:1:1:
1| assert [ 1 0 ] == [ 10 ];
1| assert
| ^
2| throw "unreachable"
2| [

error: list of size '2' is not equal to list of size '1', left hand side is '[ 1 0 ]', right hand side is '[ 10 ]'
76 changes: 34 additions & 42 deletions tests/functional/lang/eval-fail-assert-nested-bool.err.exp
View file
Original file line number Diff line number Diff line change
@@ -1,74 +1,66 @@
error:
… while evaluating the condition of the assertion '({ a = { b = [ ({ c = { d = true; }; }) ]; }; } == { a = { b = [ ({ c = { d = false; }; }) ]; }; })'
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:1:
1| assert
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
| ^
2| { a.b = [ { c.d = true; } ]; }
2|

… while comparing attribute 'a'

… where left hand side is
at /pwd/lang/eval-fail-assert-nested-bool.nix:2:5:
1| assert
2| { a.b = [ { c.d = true; } ]; }
| ^
3| ==
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:10:
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
| ^
2|

… where right hand side is
at /pwd/lang/eval-fail-assert-nested-bool.nix:4:5:
3| ==
4| { a.b = [ { c.d = false; } ]; };
| ^
5|
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:44:
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
| ^
2|

… while comparing attribute 'b'

… where left hand side is
at /pwd/lang/eval-fail-assert-nested-bool.nix:2:5:
1| assert
2| { a.b = [ { c.d = true; } ]; }
| ^
3| ==
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:10:
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
| ^
2|

… where right hand side is
at /pwd/lang/eval-fail-assert-nested-bool.nix:4:5:
3| ==
4| { a.b = [ { c.d = false; } ]; };
| ^
5|
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:44:
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
| ^
2|

… while comparing list element 0

… while comparing attribute 'c'

… where left hand side is
at /pwd/lang/eval-fail-assert-nested-bool.nix:2:15:
1| assert
2| { a.b = [ { c.d = true; } ]; }
| ^
3| ==
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:20:
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
| ^
2|

… where right hand side is
at /pwd/lang/eval-fail-assert-nested-bool.nix:4:15:
3| ==
4| { a.b = [ { c.d = false; } ]; };
| ^
5|
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:54:
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
| ^
2|

… while comparing attribute 'd'

… where left hand side is
at /pwd/lang/eval-fail-assert-nested-bool.nix:2:15:
1| assert
2| { a.b = [ { c.d = true; } ]; }
| ^
3| ==
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:20:
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
| ^
2|

… where right hand side is
at /pwd/lang/eval-fail-assert-nested-bool.nix:4:15:
3| ==
4| { a.b = [ { c.d = false; } ]; };
| ^
5|
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:54:
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
| ^
2|

error: boolean 'true' is not equal to boolean 'false'
36 changes: 18 additions & 18 deletions tests/functional/lang/eval-fail-assert.err.exp
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
error:
… while evaluating the attribute 'body'
at /pwd/lang/eval-fail-assert.nix:4:3:
3|
4| body = x "x";
at /pwd/lang/eval-fail-assert.nix:7:3:
6|
7| body = x "x";
| ^
5| }
8| }

… from call site
at /pwd/lang/eval-fail-assert.nix:4:10:
3|
4| body = x "x";
at /pwd/lang/eval-fail-assert.nix:7:10:
6|
7| body = x "x";
| ^
5| }
8| }

… while calling 'x'
at /pwd/lang/eval-fail-assert.nix:2:7:
1| let {
2| x = arg: assert arg == "y"; 123;
| ^
3|
at /pwd/lang/eval-fail-assert.nix:3:5:
2| x =
3| arg:
| ^
4| assert arg == "y";

… while evaluating the condition of the assertion '(arg == "y")'
at /pwd/lang/eval-fail-assert.nix:2:12:
1| let {
2| x = arg: assert arg == "y"; 123;
| ^
3|
at /pwd/lang/eval-fail-assert.nix:4:5:
3| arg:
4| assert arg == "y";
| ^
5| 123;

error: string '"x"' is not equal to string '"y"'
14 changes: 7 additions & 7 deletions tests/functional/lang/eval-fail-attr-name-type.err.exp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ error:
… while evaluating the attribute 'puppy."${key}"'
at /pwd/lang/eval-fail-attr-name-type.nix:3:5:
2| attrs = {
3| puppy.doggy = {};
3| puppy.doggy = { };
| ^
4| };

… while evaluating an attribute name
at /pwd/lang/eval-fail-attr-name-type.nix:7:17:
at /pwd/lang/eval-fail-attr-name-type.nix:7:15:
6| in
7| attrs.puppy.${key}
| ^
7| attrs.puppy.${key}
| ^
8|

error: expected a string but found an integer: 1
at /pwd/lang/eval-fail-attr-name-type.nix:7:17:
at /pwd/lang/eval-fail-attr-name-type.nix:7:15:
6| in
7| attrs.puppy.${key}
| ^
7| attrs.puppy.${key}
| ^
8|
9 changes: 5 additions & 4 deletions tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.err.exp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
error: undefined variable 'd'
at /pwd/lang/eval-fail-attrset-merge-drops-later-rec.nix:1:26:
1| { a.b = 1; a = rec { c = d + 2; d = 3; }; }.c
| ^
2|
at /pwd/lang/eval-fail-attrset-merge-drops-later-rec.nix:4:9:
3| a = rec {
4| c = d + 2;
| ^
5| d = 3;
8 changes: 4 additions & 4 deletions tests/functional/lang/eval-fail-bad-string-interpolation-4.err.exp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
error:
… while evaluating a path segment
at /pwd/lang/eval-fail-bad-string-interpolation-4.nix:9:3:
8| # The error message should not be too long.
9| ''${pkgs}''
at /pwd/lang/eval-fail-bad-string-interpolation-4.nix:19:3:
18| # The error message should not be too long.
19| ''${pkgs}''
| ^
10|
20|

error: cannot coerce a set to a string: { a = { a = { a = { a = "ha"; b = "ha"; c = "ha"; d = "ha"; e = "ha"; f = "ha"; g = "ha"; h = "ha"; j = "ha"; }; «8 attributes elided» }; «8 attributes elided» }; «8 attributes elided» }
16 changes: 8 additions & 8 deletions tests/functional/lang/eval-fail-derivation-name.err.exp
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
error:
… while evaluating the attribute 'outPath'
at <nix/derivation-internal.nix>:<number>:<number>:
<number>| value = commonAttrs // {
<number>| outPath = builtins.getAttr outputName strict;
| ^
<number>| drvPath = strict.drvPath;
<number>| value = commonAttrs // {
<number>| outPath = builtins.getAttr outputName strict;
| ^
<number>| drvPath = strict.drvPath;

… while calling the 'getAttr' builtin
at <nix/derivation-internal.nix>:<number>:<number>:
<number>| value = commonAttrs // {
<number>| outPath = builtins.getAttr outputName strict;
| ^
<number>| drvPath = strict.drvPath;
<number>| value = commonAttrs // {
<number>| outPath = builtins.getAttr outputName strict;
| ^
<number>| drvPath = strict.drvPath;

… while calling the 'derivationStrict' builtin
at <nix/derivation-internal.nix>:<number>:<number>:
Expand Down
16 changes: 8 additions & 8 deletions tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ error:
… while evaluating the attribute 'set'
at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:2:3:
1| {
2| set = { "${"" + "b"}" = 1; };
2| set = {
| ^
3| set = { "${"b" + ""}" = 2; };
3| "${"" + "b"}" = 1;

error: dynamic attribute 'b' already defined at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:2:11
at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:3:11:
2| set = { "${"" + "b"}" = 1; };
3| set = { "${"b" + ""}" = 2; };
| ^
4| }
error: dynamic attribute 'b' already defined at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:3:5
at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:6:5:
5| set = {
6| "${"b" + ""}" = 2;
| ^
7| };
Loading

0 comments on commit ae0bb7d

Please sign in to comment.