nixosTests.google-oslogin: handleTest -> runTest

nixos/tests/all-tests.nix

@@ -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;

nixos/tests/google-oslogin/default.nix

@@ -1,7 +1,11 @@
-import ../make-test-python.nix (
+{
-  { pkgs, ... }:
+  lib,
-  let
+  pkgs,
-    inherit (import ./../ssh-keys.nix pkgs)
+  hostPkgs,
+  ...
+}:
+let
+  inherit (import ./../ssh-keys.nix hostPkgs)
     snakeOilPrivateKey
     snakeOilPublicKey
     ;
@@ -12,16 +16,16 @@ import ../make-test-python.nix (
     StrictHostKeyChecking=no
     IdentityFile=~/.ssh/id_snakeoil
   '';
-  in
+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 = { ... }: { };
   };
@@ -74,5 +78,4 @@ import ../make-test-python.nix (
         f"ssh {MOCKADMIN}@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'"
     )
   '';
-  }
+}
-)