[Python-modules-commits] r26737 - in packages/pytest/trunk/debian (3 files)

[barry at users.alioth.debian.org]

    Date: Thursday, December 12, 2013 @ 19:41:05
  Author: barry
Revision: 26737

Actually, remove temporary-test-skip.patch and bump d/changelog back
to UNRELEASED.  python-py 1.4.19 was just uploaded by its maintainer,
and because of bug #731299, we should just wait for that to land
before uploading pytest 2.5.0.

Modified:
  packages/pytest/trunk/debian/changelog
  packages/pytest/trunk/debian/patches/series
Deleted:
  packages/pytest/trunk/debian/patches/temporary-test-skip.patch

Modified: packages/pytest/trunk/debian/changelog
===================================================================
--- packages/pytest/trunk/debian/changelog	2013-12-12 19:31:47 UTC (rev 26736)
+++ packages/pytest/trunk/debian/changelog	2013-12-12 19:41:05 UTC (rev 26737)
@@ -1,9 +1,6 @@
-pytest (2.5.0-1) unstable; urgency=low
+pytest (2.5.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * d/patches/temporary-test-skip.patch: Temporarily disable a failing
-    test which passes with python-py 1.4.19.  Remove this when #732032 is
-    resolved.
 
  -- Barry Warsaw <barry at debian.org>  Thu, 12 Dec 2013 10:27:41 -0500
 

Modified: packages/pytest/trunk/debian/patches/series
===================================================================
--- packages/pytest/trunk/debian/patches/series	2013-12-12 19:31:47 UTC (rev 26736)
+++ packages/pytest/trunk/debian/patches/series	2013-12-12 19:41:05 UTC (rev 26737)
@@ -1,2 +1 @@
 remove_google_js
-temporary-test-skip.patch

Deleted: packages/pytest/trunk/debian/patches/temporary-test-skip.patch
===================================================================
--- packages/pytest/trunk/debian/patches/temporary-test-skip.patch	2013-12-12 19:31:47 UTC (rev 26736)
+++ packages/pytest/trunk/debian/patches/temporary-test-skip.patch	2013-12-12 19:41:05 UTC (rev 26737)
@@ -1,21 +0,0 @@
-Description: pytest 2.5.0 requires py 1.4.19, but only 1.4.18 is available in
- the archives currently.  With the older version, pytest will FTBFS on Python
- 2 because this test fails.  I've verified that this test passes with a local
- build of py 1.4.19, so expect it to fail for now.  When #732032 is resolved,
- and py 1.4.19 is available, remove this patch and rebuild.
-Author: Barry Warsaw <barry at debian.org>
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732032
-Forwarded: not-needed
-
---- a/testing/test_assertion.py
-+++ b/testing/test_assertion.py
-@@ -177,6 +177,9 @@
-         expl = ' '.join(callequal('foo', 'bar'))
-         assert 'raised in repr()' not in expl
- 
-+    @pytest.mark.xfail(
-+        sys.version_info < (3,),
-+        reason='http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732032')
-     def test_unicode(self):
-         left = py.builtin._totext('£€', 'utf-8')
-         right = py.builtin._totext('£', 'utf-8')