From ff1444f8e81522524806891e533e2fe63bd907fd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 1 Feb 2026 01:36:38 +0000 Subject: [PATCH 1/5] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- nix/repo/flake.lock | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 52851d2..97e7293 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754184128, - "narHash": "sha256-AjhoyBL4eSyXf01Bmc6DiuaMrJRNdWopmdnMY0Pa/M0=", + "lastModified": 1766884708, + "narHash": "sha256-x8nyRwtD0HMeYtX60xuIuZJbwwoI7/UKAdCiATnQNz0=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "02e72200e6d56494f4a7c0da8118760736e41b60", + "rev": "15177f81ad356040b4460a676838154cbf7f6213", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "locked": { "dir": "lib", - "lastModified": 1766497301, - "narHash": "sha256-W7WeOXMUZROMtbU1qQNWy/yai+k8gG09YACFQ7ImpsQ=", + "lastModified": 1768913456, + "narHash": "sha256-P+uWjzg09q57Ur2jWCkGwNvk1bMyU20kUIKHYj+kxK0=", "owner": "rensa-nix", "repo": "core", - "rev": "e08c48b5db1052bfb8b8dad764e05decc1af893e", + "rev": "e5f47b57ae06f2fc1f888bcb56413baccb5d1062", "type": "gitlab" }, "original": { diff --git a/nix/repo/flake.lock b/nix/repo/flake.lock index 7d7a104..c340447 100644 --- a/nix/repo/flake.lock +++ b/nix/repo/flake.lock @@ -38,11 +38,11 @@ "nixmkdocs-lib": { "locked": { "dir": "lib", - "lastModified": 1766404754, - "narHash": "sha256-EjBe6x6BT8ckPirMWhSf1GfaFxORYxR/Uu71FvSAm60=", + "lastModified": 1767549915, + "narHash": "sha256-by3r2qddlyzylup5fzSaDwtoy3eFHNKb65IuIq6bsAs=", "owner": "TECHNOFAB", "repo": "nixmkdocs", - "rev": "cfa9606eeeb9288e2799896d7d42b3d3860f9ccb", + "rev": "f3b2f4b19178e97c5580367be0f97e61a085db6d", "type": "gitlab" }, "original": { @@ -64,11 +64,11 @@ "soonix-lib": { "locked": { "dir": "lib", - "lastModified": 1767274116, - "narHash": "sha256-8+VeMokZHjOLs6fRUTj/9uxbMlHKDl384Tk6K8Qjm4k=", + "lastModified": 1769607658, + "narHash": "sha256-gF9/QmmaNRgqkC5cqSGgwWvGXj9Mj4qMDkvvF/5BlSA=", "owner": "TECHNOFAB", "repo": "soonix", - "rev": "56f281eea45bdcf29674adfa7962f14e490a6051", + "rev": "19a88a0c2681bbc85bc2cbe4f2860316d50fe957", "type": "gitlab" }, "original": { @@ -81,11 +81,11 @@ "treefmt-nix": { "flake": false, "locked": { - "lastModified": 1767122417, - "narHash": "sha256-yOt/FTB7oSEKQH9EZMFMeuldK1HGpQs2eAzdS9hNS/o=", + "lastModified": 1769691507, + "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "dec15f37015ac2e774c84d0952d57fcdf169b54d", + "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", "type": "github" }, "original": { From fe5d9f421e6afd23cc60a960d82bda226415c2be Mon Sep 17 00:00:00 2001 From: technofab Date: Fri, 27 Mar 2026 15:56:33 +0100 Subject: [PATCH 2/5] fix(scriptHelpers): remove \n from echo & fix not_contains failing shell --- lib/scriptHelpers.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/scriptHelpers.sh b/lib/scriptHelpers.sh index b1e3514..ba08e47 100644 --- a/lib/scriptHelpers.sh +++ b/lib/scriptHelpers.sh @@ -11,16 +11,16 @@ function assert_not_eq() { assert "$1 -ne $2" "$3" } function assert_contains() { - echo "$1" | grep -q -- "$2" || { - echo "Assertion failed: $3. $1 does not contain $2" >&2; + echo -n "$1" | grep -q -- "$2" || { + echo "Assertion failed: $3. The following does not contain $2: $1" >&2; exit 1; } } function assert_not_contains() { - echo "$1" | grep -q -- "$2" && { - echo "Assertion failed: $3. $1 does contain $2" >&2; + echo -n "$1" | grep -q -- "$2" && { + echo "Assertion failed: $3. The following does contain $2: $1" >&2; exit 1; - } + } || true } function assert_file_contains() { grep -q -- "$2" $1 || { From 43f4f33838f21a0d5424f2b13b5a6cb71b24aa65 Mon Sep 17 00:00:00 2001 From: technofab Date: Fri, 27 Mar 2026 16:16:51 +0100 Subject: [PATCH 3/5] chore: remove colored diff since its buggy anyways --- internal/report/console/console.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/internal/report/console/console.go b/internal/report/console/console.go index efca37f..f660616 100644 --- a/internal/report/console/console.go +++ b/internal/report/console/console.go @@ -10,7 +10,6 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" "github.com/rs/zerolog/log" - "github.com/sergi/go-diff/diffmatchpatch" "gitlab.com/TECHNOFAB/nixtest/internal/types" "gitlab.com/TECHNOFAB/nixtest/internal/util" ) @@ -25,16 +24,10 @@ func PrintErrors(results types.Results, noColor bool) { fmt.Println(text.FgRed.Sprintf("⚠ Test \"%s/%s\" failed:", result.Spec.Suite, result.Spec.Name)) message := result.ErrorMessage if result.Status == types.StatusFailure && message == "" { - if noColor { - var err error - message, err = util.ComputeDiff(result.Expected, result.Actual) - if err != nil { - 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)) + var err error + message, err = util.ComputeDiff(result.Expected, result.Actual) + if err != nil { + log.Panic().Err(err).Msg("failed to compute diff") } } From 58d6539addaf872d5a9002b05b9ab547d205aea9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Mar 2026 22:23:35 +0000 Subject: [PATCH 4/5] fix(deps): update module github.com/rs/zerolog to v1.35.0 --- go.mod | 2 +- go.sum | 2 ++ package.nix | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index ab355c0..2e3df01 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( 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/stretchr/testify v1.11.1 ) diff --git a/go.sum b/go.sum index d15139e..351e68a 100644 --- a/go.sum +++ b/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/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY= 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/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= diff --git a/package.nix b/package.nix index fb6c468..ca0e4b4 100644 --- a/package.nix +++ b/package.nix @@ -19,6 +19,6 @@ buildGoModule { ]; }; subPackages = ["cmd/nixtest"]; - vendorHash = "sha256-WF/lzu9lt9SR3WiA8LLWVT1OwpE3sIOtSqf4HMIMmE8="; + vendorHash = "sha256-tojMKT5Mkt7GkdrA3sz8Y54bt26Td/tm/B0E1fwdp1Q="; meta.mainProgram = "nixtest"; } From 3a3a19d6e72446e9c34aab5b2629f60a11698ace Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 28 Mar 2026 14:26:47 +0000 Subject: [PATCH 5/5] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- nix/repo/flake.lock | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 52851d2..40408a3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754184128, - "narHash": "sha256-AjhoyBL4eSyXf01Bmc6DiuaMrJRNdWopmdnMY0Pa/M0=", + "lastModified": 1766884708, + "narHash": "sha256-x8nyRwtD0HMeYtX60xuIuZJbwwoI7/UKAdCiATnQNz0=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "02e72200e6d56494f4a7c0da8118760736e41b60", + "rev": "15177f81ad356040b4460a676838154cbf7f6213", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "locked": { "dir": "lib", - "lastModified": 1766497301, - "narHash": "sha256-W7WeOXMUZROMtbU1qQNWy/yai+k8gG09YACFQ7ImpsQ=", + "lastModified": 1768913456, + "narHash": "sha256-P+uWjzg09q57Ur2jWCkGwNvk1bMyU20kUIKHYj+kxK0=", "owner": "rensa-nix", "repo": "core", - "rev": "e08c48b5db1052bfb8b8dad764e05decc1af893e", + "rev": "e5f47b57ae06f2fc1f888bcb56413baccb5d1062", "type": "gitlab" }, "original": { diff --git a/nix/repo/flake.lock b/nix/repo/flake.lock index 7d7a104..a09aa5e 100644 --- a/nix/repo/flake.lock +++ b/nix/repo/flake.lock @@ -38,11 +38,11 @@ "nixmkdocs-lib": { "locked": { "dir": "lib", - "lastModified": 1766404754, - "narHash": "sha256-EjBe6x6BT8ckPirMWhSf1GfaFxORYxR/Uu71FvSAm60=", + "lastModified": 1771673823, + "narHash": "sha256-1WFFaQZDPdTX1vL9BP+myIcgZjwvfxSUMGnUTrFmgVc=", "owner": "TECHNOFAB", "repo": "nixmkdocs", - "rev": "cfa9606eeeb9288e2799896d7d42b3d3860f9ccb", + "rev": "deebf3dae19776200f9ef016ef6542bf9e17be8d", "type": "gitlab" }, "original": { @@ -64,11 +64,11 @@ "soonix-lib": { "locked": { "dir": "lib", - "lastModified": 1767274116, - "narHash": "sha256-8+VeMokZHjOLs6fRUTj/9uxbMlHKDl384Tk6K8Qjm4k=", + "lastModified": 1769607658, + "narHash": "sha256-gF9/QmmaNRgqkC5cqSGgwWvGXj9Mj4qMDkvvF/5BlSA=", "owner": "TECHNOFAB", "repo": "soonix", - "rev": "56f281eea45bdcf29674adfa7962f14e490a6051", + "rev": "19a88a0c2681bbc85bc2cbe4f2860316d50fe957", "type": "gitlab" }, "original": { @@ -81,11 +81,11 @@ "treefmt-nix": { "flake": false, "locked": { - "lastModified": 1767122417, - "narHash": "sha256-yOt/FTB7oSEKQH9EZMFMeuldK1HGpQs2eAzdS9hNS/o=", + "lastModified": 1773297127, + "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "dec15f37015ac2e774c84d0952d57fcdf169b54d", + "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", "type": "github" }, "original": {