From f2d6075a6e96df42e8408921bb2d200468ba31c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Wed, 31 Jan 2018 09:04:37 +0100 Subject: [PATCH] * testenv/conf/expected_files.py: Ignore pubring.gpg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: Arkadiusz Miśkiewicz --- testenv/conf/expected_files.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testenv/conf/expected_files.py b/testenv/conf/expected_files.py index 98c2e836..65adb707 100644 --- a/testenv/conf/expected_files.py +++ b/testenv/conf/expected_files.py @@ -24,9 +24,10 @@ class ExpectedFiles: snapshot = {} for parent, dirs, files in os.walk('.'): for name in files: - # pubring.kbx, dirmngr.conf, gpg.conf will be created by libgpgme if $HOME doesn't contain the .gnupg directory. + # pubring.gpg, pubring.kbx, dirmngr.conf, gpg.conf will be created by libgpgme + # if $HOME doesn't contain the .gnupg directory. # setting $HOME to CWD (in base_test.py) breaks two Metalink tests, so we skip this file here. - if name in [ 'pubring.kbx', 'dirmngr.conf', 'gpg.conf' ]: + if name in [ 'pubring.gpg', 'pubring.kbx', 'dirmngr.conf', 'gpg.conf' ]: continue f = {'content': ''}