Blob Blame History Raw
From 5d4ada1b7b0b79f8053f3d6ffddda2e2c66d9dce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Tue, 16 May 2017 10:24:52 +0200
Subject: [PATCH 4/4] Fix two Metalink tests if $HOME is changed

* conf/expected_files.py (gen_local_fs_snapshot): Skip processing
  of 'pubring.kbx'
---
 testenv/conf/expected_files.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/testenv/conf/expected_files.py b/testenv/conf/expected_files.py
index 5362771..4e3ace9 100644
--- a/testenv/conf/expected_files.py
+++ b/testenv/conf/expected_files.py
@@ -24,6 +24,11 @@ class ExpectedFiles:
         snapshot = {}
         for parent, dirs, files in os.walk('.'):
             for name in files:
+                # pubring.kbx 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 == 'pubring.kbx':
+                    continue
+
                 f = {'content': ''}
                 file_path = os.path.join(parent, name)
                 with open(file_path) as fp:
-- 
2.7.5