Merge branch 'master' into import-filefilter

This commit is contained in:
Malte Ried 2015-01-04 16:12:36 +01:00
commit 1c4dda4bd3

View file

@ -51,7 +51,7 @@ class BucketPluginTest(unittest.TestCase, TestHelper):
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."""