summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-01-18 15:52:01 +0000
committerMike Gilbert <floppym@gentoo.org>2014-01-18 15:52:01 +0000
commitba384e799efd0e381f8823988c691ea70c750822 (patch)
tree379ecd7bf5bdd7b071d01a21630c3a94fd6a9b92
parentVersion bumps. Ebuilds by Arfrever. (diff)
downloadgentoo-2-ba384e799efd0e381f8823988c691ea70c750822.tar.gz
gentoo-2-ba384e799efd0e381f8823988c691ea70c750822.tar.bz2
gentoo-2-ba384e799efd0e381f8823988c691ea70c750822.zip
Remove non-deterministic doctest, reported by maekke.
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
-rw-r--r--dev-python/webtest/ChangeLog6
-rw-r--r--dev-python/webtest/files/webtest-1.4.3-doctest.patch15
-rw-r--r--dev-python/webtest/webtest-1.4.3-r1.ebuild3
3 files changed, 22 insertions, 2 deletions
diff --git a/dev-python/webtest/ChangeLog b/dev-python/webtest/ChangeLog
index 6e7dcb046fd5..805cf6d0344f 100644
--- a/dev-python/webtest/ChangeLog
+++ b/dev-python/webtest/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/webtest
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/ChangeLog,v 1.76 2014/01/11 22:32:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/ChangeLog,v 1.77 2014/01/18 15:52:01 floppym Exp $
+
+ 18 Jan 2014; Mike Gilbert <floppym@gentoo.org>
+ +files/webtest-1.4.3-doctest.patch, webtest-1.4.3-r1.ebuild:
+ Remove non-deterministic doctest, reported by maekke.
11 Jan 2014; Mike Gilbert <floppym@gentoo.org> webtest-2.0.11.ebuild:
Fix tests.
diff --git a/dev-python/webtest/files/webtest-1.4.3-doctest.patch b/dev-python/webtest/files/webtest-1.4.3-doctest.patch
new file mode 100644
index 000000000000..15b65c517079
--- /dev/null
+++ b/dev-python/webtest/files/webtest-1.4.3-doctest.patch
@@ -0,0 +1,15 @@
+This doctest relies on dictionary key order, so remove it.
+--- a/docs/index.txt
++++ b/docs/index.txt
+@@ -321,11 +321,6 @@
+ <Element html at ...>
+ >>> res.lxml.xpath('//body/div')[0].text
+ 'hey!'
+- >>> res = TestResponse(content_type='application/json',
+- ... body=b'{"a":1,"b":2}')
+- >>> res.request = TestRequest.blank('/')
+- >>> list(res.json.values())
+- [1, 2]
+ >>> res = TestResponse(content_type='application/xml',
+ ... body=b'<xml><message>hey!</message></xml>')
+ >>> res.request = TestRequest.blank('/')
diff --git a/dev-python/webtest/webtest-1.4.3-r1.ebuild b/dev-python/webtest/webtest-1.4.3-r1.ebuild
index ca001d5b68ab..ee6c35363adb 100644
--- a/dev-python/webtest/webtest-1.4.3-r1.ebuild
+++ b/dev-python/webtest/webtest-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-1.4.3-r1.ebuild,v 1.10 2014/01/11 22:06:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-1.4.3-r1.ebuild,v 1.11 2014/01/18 15:52:01 floppym Exp $
EAPI=5
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
virtual/python-unittest2[${PYTHON_USEDEP}] )"
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}/webtest-1.4.3-doctest.patch" )
python_compile_all() {
if use doc; then