Merge pull request #143776 from iAmMrinal0/remove/awsCliTest

This commit is contained in:
Sandro 2021-10-31 23:20:43 +01:00 committed by GitHub
commit afa027591c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 24 deletions

View File

@ -32,7 +32,6 @@ in
atop = handleTest ./atop.nix {};
avahi = handleTest ./avahi.nix {};
avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
awscli = handleTest ./awscli.nix { };
babeld = handleTest ./babeld.nix {};
bazarr = handleTest ./bazarr.nix {};
bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64

View File

@ -1,17 +0,0 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "awscli";
meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus ];
};
machine = { pkgs, ... }:
{
environment.systemPackages = [ pkgs.awscli ];
};
testScript =
''
assert "${pkgs.python3Packages.botocore.version}" in machine.succeed("aws --version")
assert "${pkgs.awscli.version}" in machine.succeed("aws --version")
'';
})

View File

@ -1,5 +1,4 @@
{ lib
, nixosTests
, python3
, groff
, less
@ -34,9 +33,6 @@ with py.pkgs; buildPythonApplication rec {
--replace "docutils>=0.10,<0.16" "docutils>=0.10"
'';
# No tests included
doCheck = false;
propagatedBuildInputs = [
botocore
bcdoc
@ -62,10 +58,18 @@ with py.pkgs; buildPythonApplication rec {
passthru = {
python = py; # for aws_shell
tests = { inherit (nixosTests) awscli; };
};
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/aws --version | grep "${py.pkgs.botocore.version}"
$out/bin/aws --version | grep "${version}"
runHook postInstallCheck
'';
meta = with lib; {
homepage = "https://aws.amazon.com/cli/";
description = "Unified tool to manage your AWS services";