Hello community, here is the log from the commit of package python-nose for openSUSE:Factory checked in at 2013-01-20 14:42:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-nose (Old) and /work/SRC/openSUSE:Factory/.python-nose.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-nose", Maintainer is "radma...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-nose/python-nose.changes 2012-11-28 14:33:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-nose.new/python-nose.changes 2013-01-20 14:42:39.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 18 10:32:23 UTC 2013 - sasc...@suse.de + +- Add nose-1.2.1-plugin-failuredetail-no-tb.patch: Don't fail if + traceback is missing + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-nose/python3-nose.changes 2012-11-28 14:33:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-nose.new/python3-nose.changes 2013-01-20 14:42:39.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 18 10:32:51 UTC 2013 - sasc...@suse.de + +- Add nose-1.2.1-plugin-failuredetail-no-tb.patch: Don't fail if + traceback is missing + +------------------------------------------------------------------- New: ---- nose-1.2.1-plugin-failuredetail-no-tb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-nose-doc.spec ++++++ --- /var/tmp/diff_new_pack.NgaISZ/_old 2013-01-20 14:42:40.000000000 +0100 +++ /var/tmp/diff_new_pack.NgaISZ/_new 2013-01-20 14:42:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-nose-doc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ python-nose.spec ++++++ --- /var/tmp/diff_new_pack.NgaISZ/_old 2013-01-20 14:42:40.000000000 +0100 +++ /var/tmp/diff_new_pack.NgaISZ/_new 2013-01-20 14:42:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-nose # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ License: LGPL-2.0+ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/n/nose/nose-%{version}.tar.gz +# PATCH-FIX-UPSTREAM sasc...@suse.de -- Backport of https://github.com/nose-devs/nose/pull/603 +Patch0: nose-1.2.1-plugin-failuredetail-no-tb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute @@ -55,6 +57,7 @@ %prep %setup -q -n nose-%{version} +%patch0 -p1 sed -i "s|man/man1|share/man/man1|" setup.py # Fix man-page install path %build ++++++ python3-nose-doc.spec ++++++ --- /var/tmp/diff_new_pack.NgaISZ/_old 2013-01-20 14:42:40.000000000 +0100 +++ /var/tmp/diff_new_pack.NgaISZ/_new 2013-01-20 14:42:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-nose-doc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ python3-nose.spec ++++++ --- /var/tmp/diff_new_pack.NgaISZ/_old 2013-01-20 14:42:40.000000000 +0100 +++ /var/tmp/diff_new_pack.NgaISZ/_new 2013-01-20 14:42:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-nose # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ License: LGPL-2.0+ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/n/nose/nose-%{version}.tar.gz +# PATCH-FIX-UPSTREAM sasc...@suse.de -- Backport of https://github.com/nose-devs/nose/pull/603 +Patch0: nose-1.2.1-plugin-failuredetail-no-tb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3 BuildRequires: python3-2to3 @@ -53,6 +55,7 @@ %prep %setup -q -n nose-%{version} +%patch0 -p1 sed -i 's,man/man1,share/man/man1,' setup.py %build ++++++ nose-1.2.1-plugin-failuredetail-no-tb.patch ++++++ commit f87c831164b3ae4193d025f07b20bfcc7d131a02 Author: Sascha Peilicke <sasc...@suse.de> Date: Fri Jan 18 11:22:06 2013 +0100 Fix formatFailure expection if missing tb in exc_info The FailureDetail plugin should not fail in formatFailure if no traceback is in the exc_info tupple ('err' parameter). This happens, e.g. when used with testtools: Traceback (most recent call last): File "/usr/lib64/python2.6/site-packages/nose/case.py", line 133, in run self.runTest(result) File "/usr/lib64/python2.6/site-packages/nose/case.py", line 151, in runTest test(result) File "/usr/lib64/python2.6/unittest.py", line 300, in __call__ return self.run(*args, **kwds) File "/usr/lib64/python2.6/site-packages/testtools/testcase.py", line 518, in run return self.__RunTest(self, self.exception_handlers).run(result) File "/usr/lib64/python2.6/site-packages/testtools/runtest.py", line 74, in run return self._run_one(actual_result) File "/usr/lib64/python2.6/site-packages/testtools/runtest.py", line 88, in _run_one return self._run_prepared_result(ExtendedToOriginalDecorator(result)) File "/usr/lib64/python2.6/site-packages/testtools/runtest.py", line 107, in _run_prepared_result handler(self.case, self.result, e) File "/usr/lib64/python2.6/site-packages/testtools/testcase.py", line 494, in _report_failure result.addFailure(self, details=self.getDetails()) File "/usr/lib64/python2.6/site-packages/testtools/testresult/real.py", line 605, in addFailure return self.decorated.addFailure(test, err) File "/usr/lib64/python2.6/site-packages/nose/proxy.py", line 146, in addFailure formatted = plugins.formatFailure(self.test, err) File "/usr/lib64/python2.6/site-packages/nose/plugins/manager.py", line 99, in __call__ return self.call(*arg, **kw) File "/usr/lib64/python2.6/site-packages/nose/plugins/manager.py", line 141, in chain result = meth(*arg, **kw) File "/usr/lib64/python2.6/site-packages/nose/plugins/failuredetail.py", line 41, in formatFailure tbinfo = inspect_traceback(tb) File "/usr/lib64/python2.6/site-packages/nose/inspector.py", line 26, in inspect_traceback while tb.tb_next: AttributeError: 'NoneType' object has no attribute 'tb_next' diff --git a/AUTHORS b/AUTHORS index b852772..dce5b1c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -23,3 +23,4 @@ Peter Bengtsson Gary Donovan Brendan McCollam Erik Rose +Sascha Peilicke diff --git a/nose/plugins/failuredetail.py b/nose/plugins/failuredetail.py index 19569b5..4c0729c 100644 --- a/nose/plugins/failuredetail.py +++ b/nose/plugins/failuredetail.py @@ -38,6 +38,10 @@ class FailureDetail(Plugin): """Add detail from traceback inspection to error message of a failure. """ ec, ev, tb = err - tbinfo = inspect_traceback(tb) + tbinfo, str_ev = None, str(ev) + if tb: + tbinfo = inspect_traceback(tb) + str_ev = '\n'.join([str(ev), tbinfo]) test.tbinfo = tbinfo - return (ec, '\n'.join([str(ev), tbinfo]), tb) + return (ec, str_ev, tb) + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
