Make the tests pass with twisted 2.2. No bump because this only affects the tests.

(Portage version: 2660-svn)

5 files changed, 51 insertions, 7 deletions

diff --git a/dev-python/vertex/ChangeLog b/dev-python/vertex/ChangeLog
index 3a988cf9be3c..c58d314b7cbe 100644
--- a/dev-python/vertex/ChangeLog
+++ b/dev-python/vertex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/vertex
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/vertex/ChangeLog,v 1.1 2005/12/05 17:06:16 marienz Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/vertex/ChangeLog,v 1.2 2006/02/13 22:50:01 marienz Exp $
+
+  13 Feb 2006; Marien Zwart <marienz@gentoo.org>
+  +files/vertex-0.1-tests-2.2-compat.patch, vertex-0.1.ebuild:
+  Make the tests pass with twisted 2.2. No bump because this only affects the
+  tests.
 
 *vertex-0.1 (05 Dec 2005)
 
diff --git a/dev-python/vertex/Manifest b/dev-python/vertex/Manifest
index 0f57d3bd17b4..72f42582b8ce 100644
--- a/dev-python/vertex/Manifest
+++ b/dev-python/vertex/Manifest
@@ -1,4 +1,15 @@
 MD5 5d4f8559725030ee5c59404c8c04600b ChangeLog 336
-MD5 1f50138c0bd62cea2d15799e1cee1789 files/digest-vertex-0.1 62
+RMD160 e4cdf50cc3b3dfa630832431521056ac939f5525 ChangeLog 336
+SHA256 386452867020d9c739862a418cce45d24905431186dd26383e0e6bb61c22e55d ChangeLog 336
+MD5 f370ce4c46bdf8a3d93046b591119269 files/digest-vertex-0.1 232
+RMD160 7e5f378cde6f4b28164a81d83ad2c06316e37c2d files/digest-vertex-0.1 232
+SHA256 dae1dd15957362fedd24810cffad1fca060c1b5268f7bc15cae710d46ffc2bda files/digest-vertex-0.1 232
+MD5 23964561142ae9e0919cdb37ab1c6336 files/vertex-0.1-tests-2.2-compat.patch 867
+RMD160 6e18f9ab37958073517c905afab514817a04bd71 files/vertex-0.1-tests-2.2-compat.patch 867
+SHA256 37f0585b91311f5217ecebbfd415bbdeff48cb379cc3819549395aa8401c8b80 files/vertex-0.1-tests-2.2-compat.patch 867
 MD5 556965b9d1c03968984b4b367643abac metadata.xml 804
-MD5 de95c7cdb4a4999e6bff50ae944cc1ca vertex-0.1.ebuild 707
+RMD160 70949703b68ce47ccdc624e90b9fdd1457c1fc1b metadata.xml 804
+SHA256 d6a50e60f7da5adbd3441ffe816dee9e7e8ee0d9cf4efde8f1bb14027da55b8a metadata.xml 804
+MD5 04e7df5b1b379a402d267c6ebfc26b83 vertex-0.1.ebuild 796
+RMD160 8333e82a81be30c3710c4adb4bbdc02980471afe vertex-0.1.ebuild 796
+SHA256 62e8d6479fbff829b5d7c970767562b2b80232576e7bbc87b42ebc8e87eb03fc vertex-0.1.ebuild 796
diff --git a/dev-python/vertex/files/digest-vertex-0.1 b/dev-python/vertex/files/digest-vertex-0.1
index 6747151cef63..90ca57044957 100644
--- a/dev-python/vertex/files/digest-vertex-0.1
+++ b/dev-python/vertex/files/digest-vertex-0.1
@@ -1 +1,3 @@
 MD5 f2714a2ca2f97e35cdce3b995397d569 Vertex-0.1.tar.gz 102739
+RMD160 23934af5caae18c88312a6082670a62e73e4e108 Vertex-0.1.tar.gz 102739
+SHA256 cd197e3181101625cec1c59e08e2c058bbf918bf41e6e97ffac67bd11ae99608 Vertex-0.1.tar.gz 102739
diff --git a/dev-python/vertex/files/vertex-0.1-tests-2.2-compat.patch b/dev-python/vertex/files/vertex-0.1-tests-2.2-compat.patch
new file mode 100644
index 000000000000..cc4d4ee5006c
--- /dev/null
+++ b/dev-python/vertex/files/vertex-0.1-tests-2.2-compat.patch
@@ -0,0 +1,20 @@
+Index: trunk/Vertex/vertex/test/test_sslverify.py

+===================================================================

+--- trunk/Vertex/vertex/test/test_sslverify.py (revision 25)

++++ trunk/Vertex/vertex/test/test_sslverify.py (revision 3972)

+@@ -167,5 +167,6 @@

+         # can actually pass.

+         errors = log.flushErrors(SSL.Error)

+-        self.assertEquals(len(errors), 2)

++        # This assertion is no longer correct on Twisted trunk.

++        # self.assertEquals(len(errors), 2)

+ 

+     def testFailedCertificateVerification(self):

+@@ -183,5 +184,6 @@

+         self.failIf(sSuccess)

+         errors = log.flushErrors(SSL.Error)

+-        self.assertEquals(len(errors), 2)

++        # This assertion is no longer correct on Twisted trunk.

++        # self.assertEquals(len(errors), 2)

+ 

+     def testSuccessfulCertificateVerification(self):

diff --git a/dev-python/vertex/vertex-0.1.ebuild b/dev-python/vertex/vertex-0.1.ebuild
index a0106ce9a696..5238c04ce4a2 100644
--- a/dev-python/vertex/vertex-0.1.ebuild
+++ b/dev-python/vertex/vertex-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/vertex/vertex-0.1.ebuild,v 1.1 2005/12/05 17:06:16 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/vertex/vertex-0.1.ebuild,v 1.2 2006/02/13 22:50:01 marienz Exp $
 
 inherit distutils eutils
 
@@ -23,6 +23,12 @@ S="${WORKDIR}/Vertex-${PV}"
 
 DOCS="NAME.txt"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-tests-2.2-compat.patch"
+}
+
 src_test() {
-	trial -R vertex || die "trial failed"
+	trial vertex || die "trial failed"
 }