diff --git a/pygobject-3.3.4-known-failures.patch b/pygobject-3.3.4-known-failures.patch deleted file mode 100644 index 5d63873..0000000 --- a/pygobject-3.3.4-known-failures.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up pygobject-3.3.4/tests/test_gdbus.py.known-failures pygobject-3.3.4/tests/test_gdbus.py ---- pygobject-3.3.4/tests/test_gdbus.py.known-failures 2012-08-09 11:51:21.707712400 -0400 -+++ pygobject-3.3.4/tests/test_gdbus.py 2012-08-09 11:51:38.663713384 -0400 -@@ -100,6 +100,7 @@ class TestGDBusClient(unittest.TestCase) - call_done, data) - main_loop.run() - -+ @unittest.expectedFailure - def test_python_calls_sync(self): - # single value return tuples get unboxed to the one element - result = self.dbus_proxy.ListNames('()') -diff -up pygobject-3.3.4/tests/test_gi.py.known-failures pygobject-3.3.4/tests/test_gi.py ---- pygobject-3.3.4/tests/test_gi.py.known-failures 2012-07-16 11:24:56.000000000 -0400 -+++ pygobject-3.3.4/tests/test_gi.py 2012-08-09 11:51:10.409711484 -0400 -@@ -2199,6 +2199,7 @@ class TestPropertiesObject(unittest.Test - - self.assertAlmostEqual(obj.props.some_double, 42.0) - -+ @unittest.expectedFailure - def test_strv(self): - self.assertEqual(self.obj.props.some_strv, []) - self.obj.props.some_strv = ['hello', 'world'] diff --git a/pygobject-3.8.0-known-failures.txt b/pygobject-3.8.0-known-failures.txt deleted file mode 100644 index 28468b4..0000000 --- a/pygobject-3.8.0-known-failures.txt +++ /dev/null @@ -1,24 +0,0 @@ -diff -up pygobject-3.8.0/tests/test_gi.py.rhbz924425 pygobject-3.8.0/tests/test_gi.py ---- pygobject-3.8.0/tests/test_gi.py.rhbz924425 2013-04-02 15:12:13.023806151 -0400 -+++ pygobject-3.8.0/tests/test_gi.py 2013-04-02 15:18:08.320781858 -0400 -@@ -1507,6 +1507,20 @@ class TestEnumVFuncResults(unittest.Test - def do_vfunc_out_enum(self): - return GIMarshallingTests.Enum.VALUE3 - -+ # Failing on ppc64: -+ # https://bugzilla.redhat.com/show_bug.cgi?id=924425#c7 -+ # -+ # ====================================================================== -+ # FAIL: test_vfunc_return_enum (test_gi.TestEnumVFuncResults) -+ # ---------------------------------------------------------------------- -+ # Traceback (most recent call last): -+ # File "/builddir/build/BUILD/pygobject-3.8.0/tests/test_gi.py", line 1512, in test_vfunc_return_enum -+ # self.assertEqual(tester.vfunc_return_enum(), GIMarshallingTests.Enum.VALUE2) -+ # AssertionError: != -+ # ---------------------------------------------------------------------- -+ # -+ # Reported upstream as https://bugzilla.gnome.org/show_bug.cgi?id=697138 -+ @unittest.expectedFailure - def test_vfunc_return_enum(self): - tester = self.EnumTester() - self.assertEqual(tester.vfunc_return_enum(), GIMarshallingTests.Enum.VALUE2) diff --git a/pygobject3.spec b/pygobject3.spec index 803b442..ed3f327 100644 --- a/pygobject3.spec +++ b/pygobject3.spec @@ -30,48 +30,6 @@ URL: https://live.gnome.org/PyGObject #VCS: git:git://git.gnome.org/pygobject Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.13/pygobject-%{version}.tar.xz -# Mark some tests as known to fail; currently: -# -# On i686: -# ====================================================================== -# FAIL: test_strv (test_gi.TestPropertiesObject) -# ---------------------------------------------------------------------- -# Traceback (most recent call last): -# File "/builddir/build/BUILD/pygobject-3.3.4/tests/test_gi.py", line 2205, in test_strv -# self.assertEqual(self.obj.props.some_strv, ['hello', 'world']) -# AssertionError: Lists differ: ['hello'] != ['hello', 'world'] -# Second list contains 1 additional elements. -# First extra element 1: -# world -# - ['hello'] -# + ['hello', 'world'] -# ---------------------------------------------------------------------- -# -# Intermittently: -# ====================================================================== -# FAIL: test_python_calls_sync (test_gdbus.TestGDBusClient) -# ---------------------------------------------------------------------- -# Traceback (most recent call last): -# File "/builddir/build/BUILD/pygobject-3.3.4/tests/test_gdbus.py", line 140, in test_python_calls_sync -# self.assertTrue('Timeout' in str(e), str(e)) -# AssertionError: GDBus.Error:org.freedesktop.DBus.Error.NameHasNoOwner: Could not get PID of name '1': no such name -# ---------------------------------------------------------------------- -# -# Not yet sent upstream -Patch2: pygobject-3.3.4-known-failures.patch - -# Add regression test for rhbz#842880 -# Not yet sent upstream: -Patch3: test-list-marshalling.patch - -# Disable a test that still fails on ppc64 (see -# https://bugzilla.redhat.com/show_bug.cgi?id=924425#c7 ) -# Filed upstream as: -# https://bugzilla.gnome.org/show_bug.cgi?id=697138 -Patch5: pygobject-3.8.0-known-failures.txt - -### Build Dependencies ### - BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version} BuildRequires: python2-devel >= %{python2_version} @@ -148,9 +106,6 @@ for use in Python 3 programs. %prep %setup -q -n pygobject-%{version} -%patch2 -p1 -b .known-failures -%patch3 -p1 -b .test-list-marshalling -%patch5 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -258,6 +213,7 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity} %changelog * Mon May 26 2014 Kalev Lember - 3.13.2-1 - Update to 3.13.2 +- Drop old testsuite patches * Mon May 12 2014 Bohuslav Kabrda - 3.13.1-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 diff --git a/test-list-marshalling.patch b/test-list-marshalling.patch deleted file mode 100644 index 30ed182..0000000 --- a/test-list-marshalling.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pygobject-3.3.91/tests/test_overrides_gtk.py -=================================================================== ---- pygobject-3.3.91.orig/tests/test_overrides_gtk.py -+++ pygobject-3.3.91/tests/test_overrides_gtk.py -@@ -1553,3 +1553,8 @@ class TestTextBuffer(unittest.TestCase): - None) - self.assertEqual(start.get_offset(), 6) - self.assertEqual(end.get_offset(), 11) -+ -+ def test_rhbz842880(self): -+ # Regression test for https://bugzilla.redhat.com/show_bug.cgi?id=842880 -+ store = Gtk.ListStore(int, int) -+ store.append([1, 2])