From bd2a8c19d39403d01413af6a4c62f54af9f4fd1b Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Oct 02 2012 17:30:44 +0000 Subject: Remove epgm-disabling patch. --- diff --git a/0002-Disable-EPGM-test.patch b/0002-Disable-EPGM-test.patch deleted file mode 100644 index 05d4ffd..0000000 --- a/0002-Disable-EPGM-test.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7507ce3f5fc2646ba8fe6be67e523a51b26e1706 Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Mon, 21 May 2012 18:18:35 -0400 -Subject: [PATCH] Disable EPGM test - ---- - txzmq/test/test_pubsub.py | 18 ------------------ - 1 file changed, 18 deletions(-) - -diff --git a/txzmq/test/test_pubsub.py b/txzmq/test/test_pubsub.py -index 000376d..cd64110 100644 ---- a/txzmq/test/test_pubsub.py -+++ b/txzmq/test/test_pubsub.py -@@ -50,24 +50,6 @@ class ZmqConnectionTestCase(unittest.TestCase): - - return _wait(0.01).addCallback(check) - -- def test_send_recv_pgm(self): -- r = ZmqTestSubConnection(self.factory, ZmqEndpoint( -- ZmqEndpointType.bind, "epgm://127.0.0.1;239.192.1.1:5556")) -- s = ZmqPubConnection(self.factory, ZmqEndpoint( -- ZmqEndpointType.connect, "epgm://127.0.0.1;239.192.1.1:5556")) -- -- r.subscribe('tag') -- s.publish('xyz', 'different-tag') -- s.publish('abcd', 'tag1') -- -- def check(ignore): -- result = getattr(r, 'messages', []) -- expected = [['tag1', 'abcd']] -- self.failUnlessEqual( -- result, expected, "Message should have been received") -- -- return _wait(0.2).addCallback(check) -- - def test_send_recv_multiple_endpoints(self): - r = ZmqTestSubConnection( - self.factory, --- -1.7.10.2 - diff --git a/python-txzmq.spec b/python-txzmq.spec index 930c432..419ad2f 100644 --- a/python-txzmq.spec +++ b/python-txzmq.spec @@ -9,7 +9,6 @@ Group: Development/Languages License: GPLv2 URL: http://pypi.python.org/pypi/%{modname} Source0: http://pypi.python.org/packages/source/t/%{modname}/%{modname}-%{version}.tar.gz -Patch0: 0002-Disable-EPGM-test.patch BuildArch: noarch @@ -29,7 +28,6 @@ Twisted event loop (reactor). %prep %setup -q -n %{modname}-%{version} -%patch0 -p1 -b .disable_epgm_test # Patch out the setuptools requirement on Twisted since epel doesn't ship # twisted egg-info @@ -55,6 +53,7 @@ PYTHONPATH=$(pwd) nosetests %changelog * Tue Oct 02 2012 Ralph Bean - 0.5.2-1 - Latest upstream with new socket types. +- Remove epgm-disabling patch. * Sat Jul 21 2012 Fedora Release Engineering - 0.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild