nixos/tests: refactor gpg-keyring test utility

nikstur 7e522a81 78df3591

Changed files
+24 -21
nixos
+23
nixos/tests/common/gpg-keyring.nix
···
+
{ pkgs, ... }:
+
+
pkgs.runCommand "gpg-keyring" { nativeBuildInputs = [ pkgs.gnupg ]; } ''
+
mkdir -p $out
+
export GNUPGHOME=$out
+
cat > foo <<EOF
+
%echo Generating a basic OpenPGP key
+
%no-protection
+
Key-Type: DSA
+
Key-Length: 1024
+
Subkey-Type: ELG-E
+
Subkey-Length: 1024
+
Name-Real: Bob Foobar
+
Name-Email: bob@foo.bar
+
Expire-Date: 0
+
# Do a commit here, so that we can later print "done"
+
%commit
+
%echo done
+
EOF
+
gpg --batch --generate-key foo
+
rm $out/S.gpg-agent $out/S.gpg-agent.*
+
gpg --export bob@foo.bar -a > $out/pubkey.gpg
+
''
+1 -21
nixos/tests/systemd-nspawn.nix
···
import ./make-test-python.nix ({pkgs, lib, ...}:
let
-
gpgKeyring = (pkgs.runCommand "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } ''
-
mkdir -p $out
-
export GNUPGHOME=$out
-
cat > foo <<EOF
-
%echo Generating a basic OpenPGP key
-
%no-protection
-
Key-Type: DSA
-
Key-Length: 1024
-
Subkey-Type: ELG-E
-
Subkey-Length: 1024
-
Name-Real: Bob Foobar
-
Name-Email: bob@foo.bar
-
Expire-Date: 0
-
# Do a commit here, so that we can later print "done"
-
%commit
-
%echo done
-
EOF
-
gpg --batch --generate-key foo
-
rm $out/S.gpg-agent $out/S.gpg-agent.*
-
gpg --export bob@foo.bar -a > $out/pubkey.gpg
-
'');
+
gpgKeyring = import ./common/gpg-keyring.nix { inherit pkgs; };
nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } ''
mkdir -p $out