[Python-apps-commits] r11677 - in packages/beets/trunk/debian (4 files)

[stefanor at users.alioth.debian.org]

    Date: Sunday, January 18, 2015 @ 06:38:27
  Author: stefanor
Revision: 11677

Patch: test_bucket-years. Fix test failure when the current year is >=
2015 (Closes: #775618)

Added:
  packages/beets/trunk/debian/patches/test_bucket-years
Modified:
  packages/beets/trunk/debian/changelog
  packages/beets/trunk/debian/patches/series
  packages/beets/trunk/debian/watch

Modified: packages/beets/trunk/debian/changelog
===================================================================
--- packages/beets/trunk/debian/changelog	2015-01-17 20:16:09 UTC (rev 11676)
+++ packages/beets/trunk/debian/changelog	2015-01-18 06:38:27 UTC (rev 11677)
@@ -1,9 +1,9 @@
-beets (1.3.8+dfsg-2) UNRELEASED; urgency=medium
+beets (1.3.8+dfsg-1.1) UNRELEASED; urgency=medium
 
-  * Switch watch file to use dversionmangle and repacksuffix, now that it
-    exists.
+  * Patch: test_bucket-years. Fix test failure when the current year is >=
+    2015 (Closes: #775618)
 
- -- Stefano Rivera <stefanor at debian.org>  Thu, 23 Oct 2014 14:40:07 -0700
+ -- Stefano Rivera <stefanor at debian.org>  Sat, 17 Jan 2015 22:36:33 -0800
 
 beets (1.3.8+dfsg-1) unstable; urgency=low
 

Modified: packages/beets/trunk/debian/patches/series
===================================================================
--- packages/beets/trunk/debian/patches/series	2015-01-17 20:16:09 UTC (rev 11676)
+++ packages/beets/trunk/debian/patches/series	2015-01-18 06:38:27 UTC (rev 11677)
@@ -1 +1,2 @@
 disable-broken-tests
+test_bucket-years

Added: packages/beets/trunk/debian/patches/test_bucket-years
===================================================================
--- packages/beets/trunk/debian/patches/test_bucket-years	                        (rev 0)
+++ packages/beets/trunk/debian/patches/test_bucket-years	2015-01-18 06:38:27 UTC (rev 11677)
@@ -0,0 +1,18 @@
+Description: test_bucket: update test_year_single_year
+ 2015 was used as an example of date outside of [1970-current year] intervall
+ which is not true anymore
+Author: Fabrice Laporte <kraymer at gmail.com>
+Origin: upstream, https://github.com/sampsyo/beets/commit/80038e2a3fe6f5ac174a30f6fd01ebf8dd63e414
+Last-Updated: 2015-01-17
+
+--- a/test/test_bucket.py
++++ b/test/test_bucket.py
+@@ -51,7 +51,7 @@
+         year."""
+         self._setup_config(bucket_year=['1950', '1970'])
+         self.assertEqual(self.plugin._tmpl_bucket('2014'), '1970')
+-        self.assertEqual(self.plugin._tmpl_bucket('2015'), '2015')
++        self.assertEqual(self.plugin._tmpl_bucket('2025'), '2025')
+ 
+     def test_year_two_years(self):
+         """Buckets can be named with the 'from-to' syntax."""

Modified: packages/beets/trunk/debian/watch
===================================================================
--- packages/beets/trunk/debian/watch	2015-01-17 20:16:09 UTC (rev 11676)
+++ packages/beets/trunk/debian/watch	2015-01-18 06:38:27 UTC (rev 11677)
@@ -1,4 +1,4 @@
 version=3
 
-opts=uversionmangle=s/(b|rc)/~$1/,dversionmangle=s/\+dfsg$//,repacksuffix=+dfsg \
+opts=uversionmangle=s/(b|rc)/~$1/;s/$/\+dfsg/ \
 https://pypi.python.org/packages/source/b/beets/beets-(.+).tar.gz