From 78ff6b851cec07b1ce0ac0af60c6744280ca42e8 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Fri, 26 Nov 2021 02:28:18 +0800
Subject: [PATCH] gpg-agent: fix and enable tests

---
 tests/default.nix                                     | 1 +
 tests/modules/services/gpg-agent/default-homedir.nix  | 1 +
 tests/modules/services/gpg-agent/override-homedir.nix | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/default.nix b/tests/default.nix
index 6b21e355d..b7a398586 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -131,6 +131,7 @@ import nmt {
     ./modules/services/fluidsynth
     ./modules/services/fnott
     ./modules/services/git-sync
+    ./modules/services/gpg-agent
     ./modules/services/kanshi
     ./modules/services/lieer
     ./modules/services/pantalaimon
diff --git a/tests/modules/services/gpg-agent/default-homedir.nix b/tests/modules/services/gpg-agent/default-homedir.nix
index 1b4333e12..faf153749 100644
--- a/tests/modules/services/gpg-agent/default-homedir.nix
+++ b/tests/modules/services/gpg-agent/default-homedir.nix
@@ -5,6 +5,7 @@ with lib;
 {
   config = {
     services.gpg-agent.enable = true;
+    services.gpg-agent.pinentryFlavor = null; # Don't build pinentry package.
     programs.gpg.enable = true;
 
     test.stubs.gnupg = { };
diff --git a/tests/modules/services/gpg-agent/override-homedir.nix b/tests/modules/services/gpg-agent/override-homedir.nix
index 6c231a3b2..23d9f8765 100644
--- a/tests/modules/services/gpg-agent/override-homedir.nix
+++ b/tests/modules/services/gpg-agent/override-homedir.nix
@@ -5,16 +5,17 @@ with lib;
 {
   config = {
     services.gpg-agent.enable = true;
+    services.gpg-agent.pinentryFlavor = null; # Don't build pinentry package.
     programs.gpg = {
       enable = true;
-      homedir = "${config.home.homeDirectory}/foo/bar";
+      homedir = "/path/to/hash";
     };
 
     test.stubs.gnupg = { };
 
     nmt.script = ''
       in="${config.systemd.user.sockets.gpg-agent.Socket.ListenStream}"
-      if [[ $in != "%t/gnupg/d."????????????????????????"/S.gpg-agent" ]]
+      if [[ $in != "%t/gnupg/d.wp4h7ks5zxy4dodqadgpbbpz/S.gpg-agent" ]]
       then
         echo $in
         fail "gpg-agent socket directory is malformed"