mirror of
https://gitlab.com/TECHNOFAB/nixtest.git
synced 2026-05-04 18:29:33 +02:00
Compare commits
5 commits
ff1444f8e8
...
3a3a19d6e7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3a3a19d6e7 | ||
| 0404f64218 | |||
|
|
58d6539add | ||
| 43f4f33838 | |||
| fe5d9f421e |
7 changed files with 31 additions and 36 deletions
18
flake.lock
generated
18
flake.lock
generated
|
|
@ -2,11 +2,11 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767116409,
|
"lastModified": 1774386573,
|
||||||
"narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=",
|
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "cad22e7d996aea55ecab064e84834289143e44a0",
|
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -18,11 +18,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754184128,
|
"lastModified": 1766884708,
|
||||||
"narHash": "sha256-AjhoyBL4eSyXf01Bmc6DiuaMrJRNdWopmdnMY0Pa/M0=",
|
"narHash": "sha256-x8nyRwtD0HMeYtX60xuIuZJbwwoI7/UKAdCiATnQNz0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "02e72200e6d56494f4a7c0da8118760736e41b60",
|
"rev": "15177f81ad356040b4460a676838154cbf7f6213",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -37,11 +37,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"lastModified": 1766497301,
|
"lastModified": 1768913456,
|
||||||
"narHash": "sha256-W7WeOXMUZROMtbU1qQNWy/yai+k8gG09YACFQ7ImpsQ=",
|
"narHash": "sha256-P+uWjzg09q57Ur2jWCkGwNvk1bMyU20kUIKHYj+kxK0=",
|
||||||
"owner": "rensa-nix",
|
"owner": "rensa-nix",
|
||||||
"repo": "core",
|
"repo": "core",
|
||||||
"rev": "e08c48b5db1052bfb8b8dad764e05decc1af893e",
|
"rev": "e5f47b57ae06f2fc1f888bcb56413baccb5d1062",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
2
go.mod
2
go.mod
|
|
@ -4,7 +4,7 @@ go 1.23.0
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/akedrou/textdiff v0.1.0
|
github.com/akedrou/textdiff v0.1.0
|
||||||
github.com/rs/zerolog v1.34.0
|
github.com/rs/zerolog v1.35.0
|
||||||
github.com/spf13/pflag v1.0.10
|
github.com/spf13/pflag v1.0.10
|
||||||
github.com/stretchr/testify v1.11.1
|
github.com/stretchr/testify v1.11.1
|
||||||
)
|
)
|
||||||
|
|
|
||||||
2
go.sum
2
go.sum
|
|
@ -34,6 +34,8 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
|
||||||
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
|
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
|
||||||
github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
|
github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
|
||||||
github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
|
github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
|
||||||
|
github.com/rs/zerolog v1.35.0 h1:VD0ykx7HMiMJytqINBsKcbLS+BJ4WYjz+05us+LRTdI=
|
||||||
|
github.com/rs/zerolog v1.35.0/go.mod h1:EjML9kdfa/RMA7h/6z6pYmq1ykOuA8/mjWaEvGI+jcw=
|
||||||
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
|
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
|
||||||
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
|
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
|
||||||
github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
|
github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@ import (
|
||||||
"github.com/jedib0t/go-pretty/v6/table"
|
"github.com/jedib0t/go-pretty/v6/table"
|
||||||
"github.com/jedib0t/go-pretty/v6/text"
|
"github.com/jedib0t/go-pretty/v6/text"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
"github.com/sergi/go-diff/diffmatchpatch"
|
|
||||||
"gitlab.com/TECHNOFAB/nixtest/internal/types"
|
"gitlab.com/TECHNOFAB/nixtest/internal/types"
|
||||||
"gitlab.com/TECHNOFAB/nixtest/internal/util"
|
"gitlab.com/TECHNOFAB/nixtest/internal/util"
|
||||||
)
|
)
|
||||||
|
|
@ -25,17 +24,11 @@ func PrintErrors(results types.Results, noColor bool) {
|
||||||
fmt.Println(text.FgRed.Sprintf("⚠ Test \"%s/%s\" failed:", result.Spec.Suite, result.Spec.Name))
|
fmt.Println(text.FgRed.Sprintf("⚠ Test \"%s/%s\" failed:", result.Spec.Suite, result.Spec.Name))
|
||||||
message := result.ErrorMessage
|
message := result.ErrorMessage
|
||||||
if result.Status == types.StatusFailure && message == "" {
|
if result.Status == types.StatusFailure && message == "" {
|
||||||
if noColor {
|
|
||||||
var err error
|
var err error
|
||||||
message, err = util.ComputeDiff(result.Expected, result.Actual)
|
message, err = util.ComputeDiff(result.Expected, result.Actual)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Panic().Err(err).Msg("failed to compute diff")
|
log.Panic().Err(err).Msg("failed to compute diff")
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
dmp := diffmatchpatch.New()
|
|
||||||
diffs := dmp.DiffMain(result.Expected, result.Actual, true)
|
|
||||||
message = fmt.Sprintf("Diff:\n%s", dmp.DiffPrettyText(diffs))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if message == "" {
|
if message == "" {
|
||||||
|
|
|
||||||
|
|
@ -11,16 +11,16 @@ function assert_not_eq() {
|
||||||
assert "$1 -ne $2" "$3"
|
assert "$1 -ne $2" "$3"
|
||||||
}
|
}
|
||||||
function assert_contains() {
|
function assert_contains() {
|
||||||
echo "$1" | grep -q -- "$2" || {
|
echo -n "$1" | grep -q -- "$2" || {
|
||||||
echo "Assertion failed: $3. $1 does not contain $2" >&2;
|
echo "Assertion failed: $3. The following does not contain $2: $1" >&2;
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function assert_not_contains() {
|
function assert_not_contains() {
|
||||||
echo "$1" | grep -q -- "$2" && {
|
echo -n "$1" | grep -q -- "$2" && {
|
||||||
echo "Assertion failed: $3. $1 does contain $2" >&2;
|
echo "Assertion failed: $3. The following does contain $2: $1" >&2;
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
} || true
|
||||||
}
|
}
|
||||||
function assert_file_contains() {
|
function assert_file_contains() {
|
||||||
grep -q -- "$2" $1 || {
|
grep -q -- "$2" $1 || {
|
||||||
|
|
|
||||||
18
nix/repo/flake.lock
generated
18
nix/repo/flake.lock
generated
|
|
@ -38,11 +38,11 @@
|
||||||
"nixmkdocs-lib": {
|
"nixmkdocs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"lastModified": 1766404754,
|
"lastModified": 1771673823,
|
||||||
"narHash": "sha256-EjBe6x6BT8ckPirMWhSf1GfaFxORYxR/Uu71FvSAm60=",
|
"narHash": "sha256-1WFFaQZDPdTX1vL9BP+myIcgZjwvfxSUMGnUTrFmgVc=",
|
||||||
"owner": "TECHNOFAB",
|
"owner": "TECHNOFAB",
|
||||||
"repo": "nixmkdocs",
|
"repo": "nixmkdocs",
|
||||||
"rev": "cfa9606eeeb9288e2799896d7d42b3d3860f9ccb",
|
"rev": "deebf3dae19776200f9ef016ef6542bf9e17be8d",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -64,11 +64,11 @@
|
||||||
"soonix-lib": {
|
"soonix-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"lastModified": 1767274116,
|
"lastModified": 1769607658,
|
||||||
"narHash": "sha256-8+VeMokZHjOLs6fRUTj/9uxbMlHKDl384Tk6K8Qjm4k=",
|
"narHash": "sha256-gF9/QmmaNRgqkC5cqSGgwWvGXj9Mj4qMDkvvF/5BlSA=",
|
||||||
"owner": "TECHNOFAB",
|
"owner": "TECHNOFAB",
|
||||||
"repo": "soonix",
|
"repo": "soonix",
|
||||||
"rev": "56f281eea45bdcf29674adfa7962f14e490a6051",
|
"rev": "19a88a0c2681bbc85bc2cbe4f2860316d50fe957",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -81,11 +81,11 @@
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767122417,
|
"lastModified": 1773297127,
|
||||||
"narHash": "sha256-yOt/FTB7oSEKQH9EZMFMeuldK1HGpQs2eAzdS9hNS/o=",
|
"narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "dec15f37015ac2e774c84d0952d57fcdf169b54d",
|
"rev": "71b125cd05fbfd78cab3e070b73544abe24c5016",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,6 @@ buildGoModule {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
subPackages = ["cmd/nixtest"];
|
subPackages = ["cmd/nixtest"];
|
||||||
vendorHash = "sha256-WF/lzu9lt9SR3WiA8LLWVT1OwpE3sIOtSqf4HMIMmE8=";
|
vendorHash = "sha256-tojMKT5Mkt7GkdrA3sz8Y54bt26Td/tm/B0E1fwdp1Q=";
|
||||||
meta.mainProgram = "nixtest";
|
meta.mainProgram = "nixtest";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue