Another place to use the configured location of gpg binary

horde · Apr 9, 2015 · 053ab2b · 053ab2b
1 parent 8602688
commit 053ab2b
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/framework/Crypt/test/Horde/Crypt/PgpKeyserverTest.php b/framework/Crypt/test/Horde/Crypt/PgpKeyserverTest.php
@@ -15,13 +15,21 @@ class Horde_Crypt_PgpKeyserverTest extends Horde_Test_Case
 
     protected function setUp()
     {
-        if (!is_executable('/usr/bin/gpg')) {
-            $this->markTestSkipped('GPG binary not found at /usr/bin/gpg.');
+        $c = self::getConfig('CRYPTPGP_TEST_CONFIG', __DIR__);
+        $gnupg = isset($c['gnupg'])
+            ? $c['gnupg']
+            : '/usr/bin/gpg';
+
+        if (!is_executable($gnupg)) {
+            $this->markTestSkipped(sprintf(
+                'GPG binary not found at %s.',
+                $gnupg
+            ));
         }
 
         $this->_ks = new Horde_Crypt_Pgp_Keyserver(
             Horde_Crypt::factory('Pgp', array(
-                'program' => '/usr/bin/gpg'
+                'program' => $gnupg
             ))
         );
     }