tests: Deduplicate and simplify code.
authorJustus Winter <justus@g10code.com>
Thu, 20 Apr 2017 15:35:15 +0000 (17:35 +0200)
committerJustus Winter <justus@g10code.com>
Mon, 24 Apr 2017 13:59:49 +0000 (15:59 +0200)
* tests/gpgme/gpgme-defs.scm (create-file): Move...
* tests/gpgsm/gpgsm-defs.scm (create-file): ... likewise...
* tests/openpgp/defs.scm (create-file): Here.
(create-gpghome): Use 'create-file'.
* tests/openpgp/gpg-agent.conf.tmpl: Delete file.
* tests/openpgp/gpg.conf.tmpl: Likewise.

Signed-off-by: Justus Winter <justus@g10code.com>
tests/gpgme/gpgme-defs.scm
tests/gpgsm/gpgsm-defs.scm
tests/openpgp/defs.scm
tests/openpgp/gpg-agent.conf.tmpl [deleted file]
tests/openpgp/gpg.conf.tmpl [deleted file]

index 1e215b1..690d097 100644 (file)
 ;; The tests expect the pinentry to return the passphrase "abc".
 (setenv "PINENTRY_USER_DATA" "abc" #t)
 
-(define (create-file name . lines)
-  (letfd ((fd (open name (logior O_WRONLY O_CREAT O_BINARY) #o600)))
-    (let ((port (fdopen fd "wb")))
-      (for-each (lambda (line) (display line port) (newline port)) lines))))
-
 (define (create-gpgmehome . path)
   ;; Support for various environments.
   (define mode
index c978c32..711922a 100644 (file)
                                         (equal? key::fpr (:fpr l))))
                        (gpgsm-with-colons `(--list-secret-keys ,key::fpr))))))
 
-(define (create-file name . lines)
-  (letfd ((fd (open name (logior O_WRONLY O_CREAT O_BINARY) #o600)))
-    (let ((port (fdopen fd "wb")))
-      (for-each (lambda (line) (display line port) (newline port))
-               lines))))
-
 (define (create-gpgsmhome)
   (create-file "gpgsm.conf"
               "disable-crl-checks"
index 38d25d8..9e681bf 100644 (file)
    (lambda (port)
      (display (make-random-string size) port))))
 
+(define (create-file name . lines)
+  (letfd ((fd (open name (logior O_WRONLY O_CREAT O_BINARY) #o600)))
+    (let ((port (fdopen fd "wb")))
+      (for-each (lambda (line) (display line port) (newline port))
+               lines))))
+
 (define (create-gpghome)
   (log "Creating test environment...")
 
   (make-test-data "random_seed" 600)
 
   (log "Creating configuration files")
-  (for-each
-   (lambda (name)
-     (file-copy (in-srcdir "tests" "openpgp" (string-append name ".tmpl")) name)
-     (let ((p (open-input-output-file name)))
-       (cond
-       ((string=? "gpg.conf" name)
-        (if have-opt-always-trust
-            (display "no-auto-check-trustdb\n" p))
-        (display (string-append "agent-program "
-                                (tool 'gpg-agent)
-                                "|--debug-quick-random\n") p)
-        (display "allow-weak-digest-algos\n" p))
-       ((string=? "gpg-agent.conf" name)
-        (display (string-append "pinentry-program " PINENTRY "\n") p)))))
-   '("gpg.conf" "gpg-agent.conf")))
+  (create-file "gpg.conf"
+              "no-greeting"
+              "no-secmem-warning"
+              "no-permission-warning"
+              "batch"
+              "allow-weak-digest-algos"
+              (if have-opt-always-trust
+                  "no-auto-check-trustdb" "#no-auto-check-trustdb")
+              (string-append "agent-program "
+                             (tool 'gpg-agent)
+                             "|--debug-quick-random\n")
+              )
+  (create-file "gpg-agent.conf"
+              "allow-preset-passphrase"
+              "no-grab"
+              "enable-ssh-support"
+              (string-append "pinentry-program " (tool 'pinentry))
+              ))
 
 ;; Initialize the test environment, install appropriate configuration
 ;; and start the agent, without any keys.
diff --git a/tests/openpgp/gpg-agent.conf.tmpl b/tests/openpgp/gpg-agent.conf.tmpl
deleted file mode 100644 (file)
index 3559150..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-allow-preset-passphrase
-no-grab
-enable-ssh-support
diff --git a/tests/openpgp/gpg.conf.tmpl b/tests/openpgp/gpg.conf.tmpl
deleted file mode 100644 (file)
index 19f3180..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-no-greeting
-no-secmem-warning
-no-permission-warning
-batch