From 03b03236802a55b2e7f0af467cfafeff33dfc3b0 Mon Sep 17 00:00:00 2001
From: Orcan Ogetbil <oget@fedoraproject.org>
Date: Jul 28 2010 02:27:16 +0000
Subject: - Fix broken tests


---

diff --git a/pyutil-fixtests.patch b/pyutil-fixtests.patch
new file mode 100644
index 0000000..54a0088
--- /dev/null
+++ b/pyutil-fixtests.patch
@@ -0,0 +1,21 @@
+diff -rupN pyutil-1.7.9.old/pyutil/testutil.py pyutil-1.7.9/pyutil/testutil.py
+--- pyutil-1.7.9.old/pyutil/testutil.py	2010-06-02 17:21:34.000000000 -0400
++++ pyutil-1.7.9/pyutil/testutil.py	2010-07-27 22:20:47.000000000 -0400
+@@ -11,7 +11,7 @@ class SignalMixin(unittest.TestCase):
+     # Twisted's twisted.test.test_process
+     sigchldHandler = None
+     
+-    def setUpClass(self):
++    def setUp(self):
+         # make sure SIGCHLD handler is installed, as it should be on
+         # reactor.run(). problem is reactor may not have been run when this
+         # test runs.
+@@ -19,7 +19,7 @@ class SignalMixin(unittest.TestCase):
+             self.sigchldHandler = signal.signal(signal.SIGCHLD,
+                                                 reactor._handleSigchld)
+     
+-    def tearDownClass(self):
++    def tearDown(self):
+         if self.sigchldHandler:
+             signal.signal(signal.SIGCHLD, self.sigchldHandler)
+ 
diff --git a/pyutil.spec b/pyutil.spec
index 7cfdb23..3e21b38 100644
--- a/pyutil.spec
+++ b/pyutil.spec
@@ -1,6 +1,6 @@
 Name:           pyutil
 Version:        1.7.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A collection of mature utilities for Python programmers
 
 Group:          Development/Languages
@@ -9,6 +9,7 @@ URL:            http://allmydata.org/trac/pyutil
 Source0:        http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 Patch0:         pyutil-remove-darcs-dep.patch
 Patch1:         pyutil-remove-dependency-on-trial.patch
+Patch2:         pyutil-fixtests.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -38,6 +39,8 @@ alone in wanting tools like these.
 %patch0 -p1
 # remove dependency on setuptools_trial (#523034)
 %patch1 -p1
+# replace depracated function calls. Needs upstreamed
+%patch2 -p1
 # remove accidentally added test file, reported upstream
 rm -v pyutil/test/test_decimalutil.py
 
@@ -82,6 +85,9 @@ find %{buildroot}%{python_sitelib}/%{name} -type f -name \*.py -o -name test_tem
 
 
 %changelog
+* Tue Jul 27 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.7.9-3
+- Fix broken tests
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.7.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild