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

software/beremiz-runtime/software.cfg

@@ -19,6 +19,14 @@ parts =
 part = python2.7
 
 [open62541]
+configure-options =
+  -DBUILD_SHARED_LIBS=OFF
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DUA_ENABLE_PUBSUB=ON
+  -DUA_ENABLE_SUBSCRIPTIONS=ON
+  -DUA_NAMESPACE_ZERO=REDUCED
+
 # Beremiz need it to be in folder parts/open62541
 # as Beremiz search for open62541 to BEREMIZ_PATH/../open62541
 shared = false

software/erp5/upgrade_test/test.py

@@ -119,6 +119,11 @@ class ERP5UpgradeTestCase(SlapOSInstanceTestCase):
 
 
 class TestERP5Upgrade(ERP5UpgradeTestCase):
+  @classmethod
+  def tearDownClass(cls):
+    cls.session.close()
+    super().tearDownClass()
+
   @classmethod
   def setUpOldInstance(cls):
     cls._default_instance_old_parameter_dict = param_dict = json.loads(

software/monitor/test/test.py

@@ -162,18 +162,19 @@ class EdgeMixin(object):
     )
     for instance_reference in self.surykatka_dict:
       for info_dict in self.surykatka_dict[instance_reference].values():
+        with open(info_dict['ini-file']) as fh:
           self.assertEqual(
             info_dict['expected_ini'].strip() % info_dict,
-          open(info_dict['ini-file']).read().strip()
+            fh.read().strip()
           )
 
   def assertPromiseContent(self, instance_reference, name, content):
-    promise = open(
+    with open(
       os.path.join(
         self.slap.instance_directory, instance_reference, 'etc', 'plugin', name
-      )).read().strip()
-
-    self.assertTrue(content in promise)
+      )) as fh:
+      promise = fh.read().strip()
+    self.assertIn(content, promise)
 
   def assertSurykatkaBotPromise(self):
     for instance_reference in self.surykatka_dict:
@@ -190,9 +191,10 @@ class EdgeMixin(object):
   def assertSurykatkaCron(self):
     for instance_reference in self.surykatka_dict:
       for info_dict in self.surykatka_dict[instance_reference].values():
+        with open(info_dict['status-cron']) as fh:
           self.assertEqual(
             '*/2 * * * * %s' % (info_dict['status-json'],),
-          open(info_dict['status-cron']).read().strip()
+          fh.read().strip()
           )
 
   def initiateSurykatkaRun(self):