pool/python-lxml
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 632889 from home:comurphy:branches:devel:languages:python

Browse Source 
- Fix threading tests patch for 42.3
  * Add 0001-Make-test-more-resilient-against-changes-in-latest-l.patch
  * Remove python-lxml-assert.patch

OBS-URL: https://build.opensuse.org/request/show/632889
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-lxml?expand=0&rev=111
This commit is contained in:
Tomáš Chvátal 2018-09-03 18:18:30 +00:00 committed by Git OBS Bridge
parent bac247b95c
commit e7faf05d16
4 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Make-test-more-resilient-against-changes-in-latest-l.patch Normal file
View File

@ -0,0 +1,39 @@
From acef361ca80ff9afd828d91c98ea91c92f9d09af Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
Date: Sat, 4 Aug 2018 12:56:14 +0200
Subject: [PATCH] Make test more resilient against changes in latest libxslt
releases.
---
src/lxml/tests/test_threading.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/lxml/tests/test_threading.py b/src/lxml/tests/test_threading.py
index 8948c3ec..5ede3f80 100644
--- a/src/lxml/tests/test_threading.py
+++ b/src/lxml/tests/test_threading.py
@@ -130,7 +130,7 @@ class ThreadingTestCase(HelperTestCase):
<xsl:template match="tag" />
<!-- extend time for parsing + transform -->
''' + '\n'.join('<xsl:template match="tag%x" />' % i for i in range(200)) + '''
- <xsl:foo />
+ <xsl:UnExpectedElement />
</xsl:stylesheet>''')
self.assertRaises(etree.XSLTParseError,
etree.XSLT, style)
@@ -153,9 +153,10 @@ class ThreadingTestCase(HelperTestCase):
self.assertTrue(len(log))
if last_log is not None:
self.assertEqual(len(last_log), len(log))
- self.assertEqual(4, len(log))
+ self.assertTrue(len(log) >= 2, len(log))
for error in log:
- self.assertTrue(':ERROR:XSLT:' in str(error))
+ self.assertTrue(':ERROR:XSLT:' in str(error), str(error))
+ self.assertTrue(any('UnExpectedElement' in str(error) for error in log), log)
last_log = log
def test_thread_xslt_apply_error_log(self):
--
2.18.0

13
python-lxml-assert.patch
View File

@ -1,13 +0,0 @@
Index: lxml-4.2.0/src/lxml/tests/test_threading.py
===================================================================
--- lxml-4.2.0.orig/src/lxml/tests/test_threading.py
+++ lxml-4.2.0/src/lxml/tests/test_threading.py
@@ -153,7 +153,7 @@ class ThreadingTestCase(HelperTestCase):
self.assertTrue(len(log))
if last_log is not None:
self.assertEqual(len(last_log), len(log))
- self.assertEqual(4, len(log))
+ self.assertEqual(2, len(log))
for error in log:
self.assertTrue(':ERROR:XSLT:' in str(error))
last_log = log

7
python-lxml.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Sep 3 14:34:43 UTC 2018 - comurphy@suse.com
- Fix threading tests patch for 42.3
* Add 0001-Make-test-more-resilient-against-changes-in-latest-l.patch
* Remove python-lxml-assert.patch
-------------------------------------------------------------------
Tue Aug 7 15:34:31 UTC 2018 - toddrme2178@gmail.com

2
python-lxml.spec
View File

@ -26,7 +26,7 @@ Group: Development/Languages/Python
Url: http://lxml.de/
Source: https://files.pythonhosted.org/packages/source/l/lxml/lxml-%{version}.tar.gz
Source1: http://lxml.de/lxmldoc-%{version}.pdf
Patch0: python-lxml-assert.patch
Patch0: 0001-Make-test-more-resilient-against-changes-in-latest-l.patch
BuildRequires: %{python_module Cython >= 0.26.1}
BuildRequires: %{python_module cssselect >= 0.9.1}
BuildRequires: %{python_module devel}