rosa/hakurei
6
4
Fork 2
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 22 Wiki Activity

go: 1.27
Test / Hakurei (race detector) (push) Successful in 4m20s
Details
Test / Sandbox (push) Successful in 3m12s
Details
Test / Sandbox (race detector) (push) Successful in 2m43s
Details
Test / ShareFS (push) Successful in 5m40s
Details
Test / Create distribution (push) Successful in 56s
Details
Test / Hakurei (push) Successful in 3m28s
Details
Test / Flake checks (push) Successful in 1m12s
Details

Browse Source 
This fixes test cases affected by jsonv2 changes.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
cat
2026-08-20 19:05:29 +09:00
parent ace59607f2
commit cbd95294ba
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/hakurei/json_test.go
+1 -1
View File
@@ -66,7 +66,7 @@ func TestEncodeJSON(t *testing.T) {
want string want string
}{ }{
{"marshaler", errorJSONMarshaler{}, {"marshaler", errorJSONMarshaler{},
`cannot encode json for main.errorJSONMarshaler: unique error 3735928559 injected by the test suite`}, `cannot encode json for *main.errorJSONMarshaler: unique error 3735928559 injected by the test suite`},
{"default", func() {}, {"default", func() {},
`cannot write json: json: unsupported type: func()`}, `cannot write json: json: unsupported type: func()`},
} }
go.mod
+1 -1
View File
@@ -1,3 +1,3 @@
module hakurei.app module hakurei.app
go 1.26 go 1.27
internal/report/report_test.go
+1 -1
View File
@@ -55,7 +55,7 @@ func TestDispatch(t *testing.T) {
}), }),
}, },
}, true, []string{`{"kind":"fatal","message":"rejecting coldboot loop","error":"unique error 51966 injected by the test suite"} }, true, []string{`{"kind":"fatal","message":"rejecting coldboot loop","error":"unique error 51966 injected by the test suite"}
`, `{"kind":"inconsistent","message":"processed inconsistent uevent","error":{"fault":1,"event":{"action":"add","devpath":"\u0000","env":{"V":"\ufffd"},"seqnum":2,"subsystem":""},"object":{"state":1,"devpath":"\u0000","subsystem":"","env":{"V":"\ufffd"}}}} `, `{"kind":"inconsistent","message":"processed inconsistent uevent","error":{"fault":1,"event":{"action":"add","devpath":"\u0000","env":{"V":"` + "\ufffd" + `"},"seqnum":2,"subsystem":""},"object":{"state":1,"devpath":"\u0000","subsystem":"","env":{"V":"` + "\ufffd" + `"}}}}
`}, `dispatch: rejecting coldboot loop: unique error 51966 injected by the test suite `}, `dispatch: rejecting coldboot loop: unique error 51966 injected by the test suite
dispatch: processed inconsistent uevent: duplicate add event on devpath "\x00" dispatch: processed inconsistent uevent: duplicate add event on devpath "\x00"
`, nil}, `, nil},
test/flake.lock
Generated
+6 -6
View File
@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780361225, "lastModified": 1787146702,
"narHash": "sha256-wnV9ttf4fPWNonBIQmvlrSlNpQYgx5HgWWd007mwIFA=", "narHash": "sha256-YbRcLdU/yK4gWsQg7V8WTKZHfXL33g8+wSFUX3wyevs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e28654b71096e08c019d4861ca26acb646f583d8", "rev": "173b7e8d40fdc8c296a9c99854314f17a3a1704c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1780453794, "lastModified": 1787101114,
"narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", "narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", "rev": "b18a4b905f8d028dc4476412e6d6891728695379",
"type": "github" "type": "github"
}, },
"original": { "original": {
test/flake.nix
+2 -2
View File
@@ -99,7 +99,7 @@
hakurei = pkgs.pkgsStatic.callPackage ./package.nix { hakurei = pkgs.pkgsStatic.callPackage ./package.nix {
inherit (pkgs) inherit (pkgs)
# passthru.buildInputs # passthru.buildInputs
go_1_26 go_1_27
clang clang
# nativeBuildInputs # nativeBuildInputs
@@ -180,7 +180,7 @@
let let
# this is used for interactive vm testing during development, where tests might be broken # this is used for interactive vm testing during development, where tests might be broken
package = self.packages.${pkgs.stdenv.hostPlatform.system}.hakurei.override { package = self.packages.${pkgs.stdenv.hostPlatform.system}.hakurei.override {
buildGo126Module = previousArgs: pkgs.pkgsStatic.buildGo126Module (previousArgs // { doCheck = false; }); buildGo127Module = previousArgs: pkgs.pkgsStatic.buildGo127Module (previousArgs // { doCheck = false; });
}; };
in in
{ {
test/package.nix
+6 -6
View File
@@ -1,7 +1,7 @@
{ {
lib, lib,
stdenv, stdenv,
buildGo126Module, buildGo127Module,
makeBinaryWrapper, makeBinaryWrapper,
xdg-dbus-proxy, xdg-dbus-proxy,
pkg-config, pkg-config,
@@ -20,7 +20,7 @@
fuse3, fuse3,
# for passthru.buildInputs # for passthru.buildInputs
go_1_26, go_1_27,
clang, clang,
xorgproto, xorgproto,
@@ -32,7 +32,7 @@
withStatic ? stdenv.hostPlatform.isStatic, withStatic ? stdenv.hostPlatform.isStatic,
}: }:
buildGo126Module rec { buildGo127Module rec {
pname = "hakurei"; pname = "hakurei";
version = with lib.strings; removePrefix "v" (trim (builtins.readFile ../cmd/dist/VERSION)); version = with lib.strings; removePrefix "v" (trim (builtins.readFile ../cmd/dist/VERSION));
@@ -55,7 +55,7 @@ buildGo126Module rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
go_1_26 go_1_27
pkg-config pkg-config
wayland-scanner wayland-scanner
]; ];
@@ -126,10 +126,10 @@ buildGo126Module rec {
''; '';
passthru = { passthru = {
go = go_1_26; go = go_1_27;
targetPkgs = [ targetPkgs = [
go_1_26 go_1_27
clang clang
xorgproto xorgproto
util-linux util-linux