colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

google-cloud-sdk: move nixos test to installCheck

Browse Source
This commit is contained in:
Patrick Hilhorst 2021-10-28 14:44:26 +02:00
parent 1c5a2ba890
commit 88cff9d704
No known key found for this signature in database
GPG Key ID: 3BB083304DADC0FF
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/all-tests.nix
View File

@ -157,7 +157,6 @@ in
gobgpd = handleTest ./gobgpd.nix {};
gocd-agent = handleTest ./gocd-agent.nix {};
gocd-server = handleTest ./gocd-server.nix {};
google-cloud-sdk = handleTest ./google-cloud-sdk.nix {};
google-oslogin = handleTest ./google-oslogin {};
gotify-server = handleTest ./gotify-server.nix {};
grafana = handleTest ./grafana.nix {};

13
nixos/tests/google-cloud-sdk.nix
View File

@ -1,13 +0,0 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "google-cloud-sdk";
meta = with pkgs.lib.maintainers; { maintainers = [ iammrinal0 ]; };
machine = { pkgs, ... }: {
environment.systemPackages = [ pkgs.google-cloud-sdk ];
};
testScript = ''
import json
assert "${pkgs.google-cloud-sdk.version}" in json.loads(machine.succeed("gcloud version --format json"))["Google Cloud SDK"]
'';
})

9
pkgs/tools/admin/google-cloud-sdk/default.nix
View File

@ -117,9 +117,12 @@ in stdenv.mkDerivation rec {
runHook postInstall
'';
passthru = {
tests = { inherit (nixosTests) google-cloud-sdk; };
};
doInstallCheck = true;
# Minor smoke test, used to be a NixOS test.
installCheckPhase = ''
$out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"
'';
meta = with lib; {
description = "Tools for the google cloud platform";