[git] GnuPG - branch, master, updated. gnupg-2.1.18-32-g59048b0

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  59048b0f1aa77313573a1004cd3a9f02692a7521 (commit)
      from  1ec7dc4e55a9eb84161ce42797924c2f928e2a8e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 59048b0f1aa77313573a1004cd3a9f02692a7521
Author: Justus Winter <justus at g10code.com>
Date:   Mon Jan 30 13:25:32 2017 +0100

    Revert "tests: Add test demonstrating issue2929."
    
    This reverts commit 5aafa56dffefe3fac55b9d0555c7c86e8a07f072.

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 5cab3d5..d1dd449 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -96,8 +96,7 @@ XTESTS = \
 	issue2015.scm \
 	issue2346.scm \
 	issue2417.scm \
-	issue2419.scm \
-	issue2929.scm
+	issue2419.scm
 
 # XXX: Currently, one cannot override automake's 'check' target.  As a
 # workaround, we avoid defining 'TESTS', thus automake will not emit
diff --git a/tests/openpgp/issue2929.scm b/tests/openpgp/issue2929.scm
deleted file mode 100644
index 44521bb..0000000
--- a/tests/openpgp/issue2929.scm
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env gpgscm
-
-;; Copyright (C) 2017 g10 Code GmbH
-;;
-;; This file is part of GnuPG.
-;;
-;; GnuPG is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-;;
-;; GnuPG is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-(load (with-path "defs.scm"))
-(setup-environment)
-
-(catch (skip "Tofu not supported")
-       (call-check `(, at gpg --trust-model=tofu --list-config)))
-
-;; Redefine GPG without --always-trust and TOFU trust model.
-(define gpg `(,(tool 'gpg) --no-permission-warning --trust-model=tofu))
-
-(info "Checking key creation with TOFU trust model (issue2929).")
-(call-check `(, at gpg --quick-generate-key frob at example.org))
-(call-check `(, at gpg --sign gpg.conf))
-(call-check `(, at gpg --verify gpg.conf.gpg))

-----------------------------------------------------------------------

Summary of changes:
 tests/openpgp/Makefile.am   |  3 +--
 tests/openpgp/issue2929.scm | 32 --------------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 tests/openpgp/issue2929.scm


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org