Merge remote-tracking branch 'upstream/master' into zope4py2

component/mariadb/buildout.cfg

@@ -99,8 +99,8 @@ post-install =
 # as plugin-dir ( https://mariadb.com/kb/en/server-system-variables/#plugin_dir )
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://packages.groonga.org/source/mroonga/mroonga-12.07.tar.gz
-md5sum = bee7506e08deda9a607d85ed03b8b62e
+url = https://packages.groonga.org/source/mroonga/mroonga-12.09.tar.gz
+md5sum = 637d73b86239cc9c3758e9486746d430
 pre-configure =
   rm -rf fake_mariadb_source
   mkdir -p fake_mariadb_source

software/erp5/test/test/test_mariadb.py

@@ -173,15 +173,16 @@ class TestCrontabs(MariaDBTestCase, CrontabMixin):
             'check-slow-query-pt-digest-result.py',
         ))
     with self.assertRaises(subprocess.CalledProcessError) as error_context:
-      subprocess.check_output('faketime 2050-01-01 %s' % check_slow_query_promise_plugin['command'], shell=True)
+      subprocess.check_output(
+        'faketime 2050-01-01 %s' % check_slow_query_promise_plugin['command'],
+        text=True,
+        shell=True)
     self.assertEqual(
-        error_context.exception.output,
-b"""\
-Threshold is lower than expected: 
-Expected total queries : 1.0 and current is: 2
-Expected slowest query : 0.1 and current is: 3
-""")
-
+      error_context.exception.output,
+      "Threshold is lower than expected: \n"
+      "Expected total queries : 1.0 and current is: 2\n"
+      "Expected slowest query : 0.1 and current is: 3\n",
+    )
 
 class TestMariaDB(MariaDBTestCase):
   def test_utf8_collation(self):