diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-27 05:44:19 +0200 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-27 05:44:19 +0200 |
commit | 37876dbdadca20702d3547bab7838fa4ca1bae33 (patch) | |
tree | 92efdc055a9cd4e4c680a32d4a0492e8a2e11855 /nixos/tests | |
parent | 2521336f17c46069cb8fbba200974fcc12e9ea9d (diff) | |
parent | 86aa70f787d423141167d1cde8af6d81126e22a1 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/castopod.nix | 2 | ||||
-rw-r--r-- | nixos/tests/forgejo.nix | 6 | ||||
-rw-r--r-- | nixos/tests/web-apps/gotosocial.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nixos/tests/castopod.nix b/nixos/tests/castopod.nix index 29bf8e8cacd89..3257cd3d363c7 100644 --- a/nixos/tests/castopod.nix +++ b/nixos/tests/castopod.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "castopod"; meta = with lib.maintainers; { - maintainers = [ alexoundos misuzu ]; + maintainers = [ alexoundos ]; }; nodes.castopod = { nodes, ... }: { diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix index 8b9ee46ff5d32..827fae2790c6e 100644 --- a/nixos/tests/forgejo.nix +++ b/nixos/tests/forgejo.nix @@ -141,9 +141,9 @@ let assert "BEGIN PGP PUBLIC KEY BLOCK" in server.succeed("curl http://localhost:3000/api/v1/signing-key.gpg") api_version = json.loads(server.succeed("curl http://localhost:3000/api/forgejo/v1/version")).get("version") - assert "development" != api_version and "-gitea-" in api_version, ( + assert "development" != api_version and "${pkgs.forgejo.version}+gitea-" in api_version, ( "/api/forgejo/v1/version should not return 'development' " - + f"but should contain a gitea compatibility version string. Got '{api_version}' instead." + + f"but should contain a forgejo+gitea compatibility version string. Got '{api_version}' instead." ) server.succeed( @@ -152,7 +152,7 @@ let ) server.succeed( "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea admin user create " - + "--username test --password totallysafe --email test@localhost'" + + "--username test --password totallysafe --email test@localhost --must-change-password=false'" ) api_token = server.succeed( diff --git a/nixos/tests/web-apps/gotosocial.nix b/nixos/tests/web-apps/gotosocial.nix index 8c4e76b14e3bf..f9d28c2b8b998 100644 --- a/nixos/tests/web-apps/gotosocial.nix +++ b/nixos/tests/web-apps/gotosocial.nix @@ -1,7 +1,7 @@ { lib, ... }: { name = "gotosocial"; - meta.maintainers = with lib.maintainers; [ misuzu blakesmith ]; + meta.maintainers = with lib.maintainers; [ blakesmith ]; nodes.machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; |