rpms/TurboGears/devel turbogears-sa0.6.patch, NONE, 1.1 TurboGears.spec, 1.54, 1.55

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25981

Modified Files:
	TurboGears.spec 
Added Files:
	turbogears-sa0.6.patch 
Log Message:

* Mon May 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-4
- Fix failing unittest with SA-0.6


turbogears-sa0.6.patch:
 test_sqlalchemy.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE turbogears-sa0.6.patch ---
Index: TurboGears-1.0.9/turbogears/tests/test_sqlalchemy.py
===================================================================
--- TurboGears-1.0.9.orig/turbogears/tests/test_sqlalchemy.py
+++ TurboGears-1.0.9/turbogears/tests/test_sqlalchemy.py
@@ -208,8 +208,8 @@ def test_raise_sa_exception():
     assert 'No exceptions occurred' in output
     create_request("/create_person?id=20")
     output = cherrypy.response.body[0]
-    # SA 0.3 uses SQLError, 0.4 DBAPIError
-    assert 'SQLError' in output or 'DBAPIError' in output
+    # SA 0.3 uses SQLError, 0.4 DBAPIError, 0.6 uses IntegrityError
+    assert 'SQLError' in output or 'DBAPIError' in output or 'IntegrityError' in output
 
 def test_user_exception():
     """If a controller raises an exception, transactions are rolled back."""


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- TurboGears.spec	11 Feb 2010 21:31:39 -0000	1.54
+++ TurboGears.spec	1 Jun 2010 01:17:56 -0000	1.55
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -18,6 +18,8 @@ Patch3: feedkid.diff
 # Reported upstream http://trac.turbogears.org/ticket/2419
 Patch4: turbogears-sqlcreate.patch
 Patch5: turbogears-deprecation.patch
+# Backport of patch to test suite for SA-0.6
+Patch6: turbogears-sa0.6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -78,6 +80,7 @@ TurboGears is easy to use for a wide ran
 %patch3 -p0 -b .feedkid
 %patch4 -p1 -b .sqlcreate
 %patch5 -p1 -b .depr
+%patch6 -p1 -b sa0.6
 
 %build
 %{__python} setup.py build
@@ -100,6 +103,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon May 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-4
+- Fix failing unittest with SA-0.6
+
 * Wed Jan 13 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-3
 - Fix deprecation warnings