From a6673133efda088c44d73f0c1ae752f59587e3f4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 4 Jan 2015 16:34:11 +0100 Subject: [PATCH] beets: Add patch for fixing bucket tests. See, that's why I hate the gregorian calendar and new years eve: People tend to celebrate things that are absolutely irrelevant, like this comment. The test however assumed that either beets or its test suite would never survive 2015, so this test should assure it won't survive in >= 2015 :-) Anyway, the patch is from upstream master, so we can drop it once 1.3.10 is released. Signed-off-by: aszlig --- pkgs/tools/audio/beets/default.nix | 1 + .../audio/beets/test-bucket-fix-year.patch | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/audio/beets/test-bucket-fix-year.patch diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 7e14154eb20..7148ca62027 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -106,6 +106,7 @@ in buildPythonPackage rec { patches = [ ./mediafile-codec-fix.patch ./replaygain-default-audiotools.patch + ./test-bucket-fix-year.patch ]; postPatch = '' diff --git a/pkgs/tools/audio/beets/test-bucket-fix-year.patch b/pkgs/tools/audio/beets/test-bucket-fix-year.patch new file mode 100644 index 00000000000..967476006a8 --- /dev/null +++ b/pkgs/tools/audio/beets/test-bucket-fix-year.patch @@ -0,0 +1,23 @@ +From 80038e2a3fe6f5ac174a30f6fd01ebf8dd63e414 Mon Sep 17 00:00:00 2001 +From: Fabrice Laporte +Date: Sat, 3 Jan 2015 23:03:29 +0100 +Subject: [PATCH] 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 +--- + test/test_bucket.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/test_bucket.py b/test/test_bucket.py +index 4610ec7..060c360 100644 +--- a/test/test_bucket.py ++++ b/test/test_bucket.py +@@ -51,7 +51,7 @@ def test_year_single_year_last_folder(self): + 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."""