[packages/wget] - libgpgme can create more files, ignore these and that fixes tests Test-metalink-http.py and Test-m

arekm arekm at pld-linux.org
Mon Oct 30 12:45:03 CET 2017


commit 3eae9ed982d9c6480f81f0397b1c44d8a258f20c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Oct 30 12:44:54 2017 +0100

    - libgpgme can create more files, ignore these and that fixes tests Test-metalink-http.py and Test-metalink-http-quoted.py

 wget-tests.patch | 14 ++++++++++++++
 wget.spec        |  2 ++
 2 files changed, 16 insertions(+)
---
diff --git a/wget.spec b/wget.spec
index 87feca1..d59d71c 100644
--- a/wget.spec
+++ b/wget.spec
@@ -30,6 +30,7 @@ Patch1:		%{name}-wgetrc_path.patch
 Patch2:		%{name}-home_etc.patch
 Patch3:		%{name}-ssl-certs.patch
 Patch4:		user.xdg.origin.url.patch
+Patch5:		%{name}-tests.patch
 URL:		http://www.gnu.org/software/wget/
 BuildRequires:	attr-devel
 BuildRequires:	autoconf >= 2.61
@@ -138,6 +139,7 @@ Proxy серверів, настроюваність.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__rm} doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion po/stamp-po
 
diff --git a/wget-tests.patch b/wget-tests.patch
new file mode 100644
index 0000000..f754951
--- /dev/null
+++ b/wget-tests.patch
@@ -0,0 +1,14 @@
+--- wget-1.19.2/testenv/conf/expected_files.py.org	2017-10-30 12:36:46.911716601 +0100
++++ wget-1.19.2/testenv/conf/expected_files.py	2017-10-30 12:41:03.358656484 +0100
+@@ -24,9 +24,9 @@ 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.
++                # pubring.kbx, dirmngr.conf, gpg.conf can 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':
++                if name == 'pubring.kbx' or name == 'dirmngr.conf' or name == 'gpg.conf':
+                     continue
+ 
+                 f = {'content': ''}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wget.git/commitdiff/3eae9ed982d9c6480f81f0397b1c44d8a258f20c



More information about the pld-cvs-commit mailing list