Merge pull request ckan#3391 from ckan/3391-circle-perf-fix

some tests running on all circleci containers

.circleci-matrix.yml

@@ -1,6 +1,6 @@
 env:
-- SEGMENTS="0123"
-- SEGMENTS="4567"
+- SEGMENTS="01234"
+- SEGMENTS="567"
 - SEGMENTS="89ab"
 - SEGMENTS="cdef"
 

ckan/ckan_nose_plugin.py

@@ -83,17 +83,14 @@ def options(self, parser, env):
             help='drop database and reinitialize before tests are run')
 
     def wantClass(self, cls):
-        name = cls.__name__
-
-        wanted = (not cls.__name__.startswith('_')
-                  and (issubclass(cls, unittest.TestCase)
-                       or re.search('(?:^|[\b_\./-])[Tt]est', name)
-                      ))
-
-        if self.segments and str(hashlib.md5(name).hexdigest())[0] not in self.segments:
+        if self.segments and str(hashlib.md5(
+                cls.__name__).hexdigest())[0] not in self.segments:
             return False
 
-        return wanted
+    def wantFunction(self, fn):
+        if self.segments and hashlib.md5(
+                fn.__name__).hexdigest()[0] not in self.segments:
+            return False
 
     def finalize(self, report):
         if self.segments:

ckan/i18n/fr/LC_MESSAGES/ckan.po

@@ -924,7 +924,7 @@ msgstr[1] "Il y a plus de {years} ans"
 
 #: ckan/lib/formatters.py:148
 msgid "{month} {day}, {year}, {hour:02}:{min:02} ({timezone})"
-msgstr "{month} {day}, {year}, {heure:02}:{min:02} ({timezone})"
+msgstr "{month} {day}, {year}, {hour:02}:{min:02} ({timezone})"
 
 #: ckan/lib/formatters.py:153
 msgid "{month} {day}, {year}"