nixosTests.google-oslogin: handleTest -> runTest

This commit is contained in:
Sizhe Zhao
2025-07-09 00:16:41 +08:00
parent 7b09056b8f
commit cdab66d5b8
2 changed files with 71 additions and 68 deletions

View File

@@ -613,7 +613,7 @@ in
gokapi = runTest ./gokapi.nix;
gollum = runTest ./gollum.nix;
gonic = runTest ./gonic.nix;
google-oslogin = handleTest ./google-oslogin { };
google-oslogin = runTest ./google-oslogin;
gopro-tool = runTest ./gopro-tool.nix;
goss = runTest ./goss.nix;
gotenberg = runTest ./gotenberg.nix;

View File

@@ -1,7 +1,11 @@
import ../make-test-python.nix (
{ pkgs, ... }:
{
lib,
pkgs,
hostPkgs,
...
}:
let
inherit (import ./../ssh-keys.nix pkgs)
inherit (import ./../ssh-keys.nix hostPkgs)
snakeOilPrivateKey
snakeOilPublicKey
;
@@ -15,13 +19,13 @@ import ../make-test-python.nix (
in
{
name = "google-oslogin";
meta = with pkgs.lib.maintainers; {
meta = with lib.maintainers; {
maintainers = [ ];
};
nodes = {
# the server provides both the the mocked google metadata server and the ssh server
server = (import ./server.nix pkgs);
server = ./server.nix;
client = { ... }: { };
};
@@ -75,4 +79,3 @@ import ../make-test-python.nix (
)
'';
}
)