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

component/proxysql/buildout.cfg

@@ -47,4 +47,4 @@ environment =
 patch-options = -p1
 patches =
 # PR #3402 (mariadb_client: backport patch to fix syntax error in cmake 3.20)
-  https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch#bb034744fd9b676484d34a269ab2ed07
+  https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch#34fd6366d4a75fde821cee93d25eee10

software/theia/test/test.py

@@ -311,10 +311,12 @@ class TestTheiaWithEmbeddedInstance(TheiaTestCase):
     self.assertSupplied(sr_url, info=proxy_info)
     name = 'embedded_instance'
     self.assertIn(name, self.captureSlapos('service', 'list', text=True))
-    info = self.captureSlapos('service', 'info', name, text=True)
-    self.assertIn(sr_url, info)
+    info = json.loads(self.captureSlapos('service', 'info', name, text=True))
+    self.assertEqual(info['software-url'], sr_url)
+    # XXX: slapos service info does not show the software type, so we check in
+    # slapos proxy show output
     self.assertIn(sr_type, proxy_info)
-    self.assertIn(repr(config).replace("u'", "'"), info)
+    self.assertEqual(info['instance-parameters'], config)
 
   def assertNotEmbedded(self, sr_url, sr_type, config):
     sr_url = self.expandUrl(sr_url)