Update Release Candidate

component/fluentbit-plugin-wendelin/buildout.cfg

+# This is part of the OCEAN project.
+# Plugin for fluent-bit to send data to Wendelin:
+# https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin
+
+[buildout]
+extends =
+  ../golang/buildout.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+
+[fluentbit-plugin-wendelin]
+recipe = slapos.recipe.cmmi
+share = true
+url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/v0.1i-dev_buildout/fluentbit-plugin-wendelin-v0.1i-dev_buildout.tar.gz
+md5sum = 9ed2ef46b0edfca072255b849ee65249
+configure-command = echo "No configure command."
+environment =
+  PATH=${golang1.17:location}/bin:%(PATH)s
+  PREFIX=@@LOCATION@@

component/jsoncpp/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  jsoncpp
+
+[jsoncpp]
+recipe = slapos.recipe.cmmi
+shared = true
+pre-configure =
+  mkdir jsoncpp-build
+configure-command =
+  cd jsoncpp-build && ${cmake:location}/bin/cmake ..
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+url = https://github.com/open-source-parsers/jsoncpp/archive/refs/tags/1.9.5.tar.gz
+md5sum = d6c8c609f2162eff373db62b90a051c7
+make-binary =
+  cd jsoncpp-build && make
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s

component/mavsdk/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+  ../curl/buildout.cfg
+  ../git/buildout.cfg
+  ../jsoncpp/buildout.cfg
+  ../tinyxml2/buildout.cfg
+
+parts =
+  mavsdk
+
+[c-astral-headers]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/c-astral-c-library
+revision = v0.1
+git-executable = ${git:location}/bin/git
+
+[gcc]
+min_version = 7.1
+
+[mavsdk-source]
+recipe = slapos.recipe.build:gitclone
+repository = https://github.com/mavlink/MAVSDK.git
+revision = v0.37.0
+
+git-executable = ${git:location}/bin/git
+ignore-cloning-submodules = true
+
+[mavsdk]
+recipe = slapos.recipe.cmmi
+path = ${mavsdk-source:location}
+cmake = ${cmake:location}/bin/cmake
+pre-configure =
+  ${git:location}/bin/git submodule update --init --recursive
+  cp -r ${c-astral-headers:location}/* ${mavsdk-source:location}/src/third_party/mavlink/include/mavlink/v2.0/
+  sed -i 's#common/mavlink.h#CAstral/mavlink.h#' ${mavsdk-source:location}/src/core/mavlink_include.h
+configure-command =
+  ${:cmake}
+configure-options =
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
+  -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}"
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}
+  -DPKG_CONFIG_EXECUTABLE=${pkgconfig:location}/bin/pkg-config
+  -DSUPERBUILD=OFF
+  -Bbuild/default
+  -H.
+make-binary =
+  ${:cmake} --build build/default --target install
+environment =
+  CMAKE_INCLUDE_PATH=${curl:location}/include:${jsoncpp:location}/include:${tinyxml2:location}/include
+  CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
+  CMAKE_PROGRAM_PATH=${cmake:location}/bin
+  PATH=${pkgconfig:location}/bin/:%(PATH)s
+  LDFLAGS=-L${jsoncpp:location}/lib -Wl,-rpath=${jsoncpp:location}/lib
+
+CMAKE_CFLAGS=-I${tinyxml2:location}/include
+CMAKE_LIBRARY_PATH=${curl:location}/lib:${jsoncpp:location}/lib:${tinyxml2:location}/lib

component/mca/buildout.cfg

+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+
+[buildout]
+extends =
+  ../../component/defaults.cfg
+  ../../component/fmtlib/buildout.cfg
+  ../../component/openssl/buildout.cfg
+
+parts =
+  mca
+
+[mca]
+recipe = slapos.recipe.cmmi
+url = https://lab.nexedi.com/nexedi/metadata-collect-agent/-/archive/v0.2h-dev_buildout/metadata-collect-agent-v0.2h-dev_buildout.tar.gz
+md5sum = f394ea9507d13a0b18f9485e70abaf32
+configure-command = :
+make-targets =
+  no-dracut
+  install-no-dracut
+environment =
+  PYTHON_PATH=${python3:location}
+  PREFIX=@@LOCATION@@
+  OPENSSL_PATH=${openssl:location}
+  FMTLIB_PATH=${fmtlib:location}

component/open62541/buildout.cfg

@@ -4,14 +4,26 @@
 parts = open62541
 extends =
   ../cmake/buildout.cfg
+  ../patch/buildout.cfg
 
 [open62541]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/open62541/open62541/archive/refs/tags/v1.2.2.tar.gz
-md5sum = 2883bde165bc9bc3d459ccbb47acf7f4
-configure-command = ${cmake:location}/bin/cmake
+url = https://github.com/open62541/open62541/archive/refs/heads/pack/v1.3.zip
+md5sum = c2e9938f082b027110fba538de76684c
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/ipv6_bugfix.patch#355bec02adee4ea73ff5a56ba6971ad2
+configure-command =
+  ${cmake:location}/bin/cmake
 configure-options =
-  -Bbuild
+  -DBUILD_SHARED_LIBS=ON
+  -DCMAKE_BUILD_TYPE=Release
   -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
-make-options = -C build
+  -DUA_ENABLE_PUBSUB=ON
+  -DUA_ENABLE_SUBSCRIPTIONS=ON
+  -DUA_NAMESPACE_ZERO=REDUCED
+post-install =
+  cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include
+environement =
+  PATH=${patch:location}/bin:%(PATH)s

component/open62541/ipv6_bugfix.patch

+commit ccdde2eddfd2e0937ba0b452063c60c214f5f2f5 (HEAD -> master)
+Author: Thomas Gambier <thomas.gambier@nexedi.com>
+Date:   Sat May 28 19:18:02 2022 +0200
+
+    BUGFIX: UA_PubSubChannelUDPMC_regist supports different interface in IPv6
+
+diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
+index 2c6ea480..f66f5860 100644
+--- a/plugins/ua_pubsub_udp.c
++++ b/plugins/ua_pubsub_udp.c
+@@ -319,6 +319,7 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
+                              "Interface configuration preparation failed.");
+                 goto cleanup;
+             }
++            memcpy(&channelDataUDPMC->intf_addr, &group.ipv6.ipv6mr_interface, sizeof(group.ipv6.ipv6mr_interface));
+         }
+ #endif
+     }
+@@ -432,6 +433,7 @@ UA_PubSubChannelUDPMC_regist(UA_PubSubChannel *channel, UA_ExtensionObject *tran
+         memcpy(&groupV6.ipv6mr_multiaddr,
+                &((const struct sockaddr_in6 *) &connectionConfig->ai_addr)->sin6_addr,
+                sizeof(struct in6_addr));
++        memcpy(&groupV6.ipv6mr_interface, &connectionConfig->intf_addr, sizeof(int));
+ 
+         if(UA_setsockopt(channel->sockfd,
+             connectionConfig->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+

component/qjs-wrapper/buildout.cfg

+[buildout]
+extends =
+  ../mavsdk/buildout.cfg
+  ../open62541/buildout.cfg
+  ../quickjs/buildout.cfg
+
+parts = qjs-wrapper
+
+[qjs-wrapper]
+recipe = slapos.recipe.cmmi
+shared = true
+configure-command = true
+url = https://lab.nexedi.com/nexedi/qjs-wrapper/-/archive/v0.1/qjs-wrapper-v0.1.tar.gz
+md5sum = 4f0eb6f3bc5719a8ec043ce4f4d20747
+environment =
+  C_INCLUDE_PATH=include:${open62541:location}/include:${open62541:location}/deps:${open62541:location}/src/pubsub:${quickjs:location}/include
+  CPLUS_INCLUDE_PATH=include:${mavsdk:location}/include:${mavsdk:location}/include/mavsdk
+  LDFLAGS=-L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -L${mavsdk:location}/lib -Wl,-rpath=${mavsdk:location}/lib

component/quickjs/buildout.cfg

@@ -5,8 +5,9 @@ parts = quickjs
 
 [quickjs]
 recipe = slapos.recipe.cmmi
+shared = true
 configure-command = true
-url = https://bellard.org/quickjs/quickjs-2020-09-06.tar.xz
-md5sum = 47cb6def3263d6a631b647b268b1c554
+url = https://bellard.org/quickjs/quickjs-2021-03-27.tar.xz
+md5sum = 135182a626aa0c87a49aa2bf58fd39bf
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s

component/tinyxml2/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+
+parts =
+  tinyxml2
+
+[tinyxml2]
+recipe = slapos.recipe.cmmi
+shared = true
+configure-command =
+  ${cmake:location}/bin/cmake
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -Dtinyxml2_SHARED_LIBS=ON
+url = https://github.com/leethomason/tinyxml2/archive/refs/tags/9.0.0.tar.gz
+md5sum = afecd941107a8e74d3d1b4363cf52bd7

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.253'
+version = '1.0.272'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 

slapos/recipe/simplehttpserver/simplehttpserver.py

@@ -36,6 +36,15 @@ class ServerHandler(SimpleHTTPRequestHandler):
     SimpleHTTPRequestHandler.do_GET(self)
 
   def do_POST(self):
+    """Write to a file on the server.
+
+    request keys:
+      path: the path of the file
+      content: content of the file
+      clear: (0|1 default 1) overwrite the file if 1
+
+    request can be encoded as application/x-www-form-urlencoded or multipart/form-data
+    """
     logging.info('%s - POST: %s \n%s' % (self.client_address[0], self.path, self.headers))
     if self.restrictedRootAccess():
       return
@@ -46,14 +55,20 @@ class ServerHandler(SimpleHTTPRequestHandler):
       environ={'REQUEST_METHOD': 'POST',
                'CONTENT_TYPE': self.headers['Content-Type']}
     )
-    name = form['path'].value.decode('utf-8')
-    content = form['content'].value
-    method = 'ab'
-    if 'clear' in form and form['clear'].value == '1':
-      method = 'wb'
-    self.writeFile(name, content, method)
+
+    file_content = form['content'].value
+    file_path = form['path'].value
+    if form['content'].file:
+      # post data as multipart/form-data , values are bytes
+      file_path = file_path.decode('utf-8')
+    else:
+      # application/x-www-form-urlencoded , values are str
+      file_content = file_content.encode('utf-8')
+    file_open_mode = 'wb' if ('clear' in form and form['clear'].value in ('1', b'1')) else 'ab'
+
+    self.writeFile(file_path, file_content, file_open_mode)
     self.respond(200, type=self.headers['Content-Type'])
-    self.wfile.write(b"Content written to %s" % str2bytes(name))
+    self.wfile.write(b"Content written to %s" % str2bytes(file_path))
 
   def writeFile(self, filename, content, method='ab'):
     file_path = os.path.abspath(os.path.join(self.document_path, filename))

slapos/test/recipe/test_simplehttpserver.py

@@ -71,22 +71,43 @@ class SimpleHTTPServerTest(unittest.TestCase):
           'server did not start.\nout: %s error: %s' % self.process.communicate())
     self.assertIn('Directory listing for /', resp.text)
 
+    # post with multipart/form-data encoding
     resp = requests.post(
         server_base_url,
         files={
-            'path': 'hello.txt',
-            'content': b'hello',
+            'path': 'hello-form-data.txt',
+            'content': 'hello-form-data',
+        },
+    )
+    self.assertEqual(resp.status_code, requests.codes.ok)
+    self.assertEqual(resp.text, 'Content written to hello-form-data.txt')
+    with open(
+        os.path.join(self.base_path, self.recipe.options['path'],
+                     'hello-form-data.txt')) as f:
+      self.assertEqual(f.read(), 'hello-form-data')
+
+    self.assertIn('hello-form-data.txt', requests.get(server_base_url).text)
+    self.assertEqual(
+        requests.get(server_base_url + '/hello-form-data.txt').text, 'hello-form-data')
+
+    # post as application/x-www-form-urlencoded
+    resp = requests.post(
+        server_base_url,
+        data={
+            'path': 'hello-form-urlencoded.txt',
+            'content': 'hello-form-urlencoded',
         },
     )
     self.assertEqual(resp.status_code, requests.codes.ok)
     with open(
         os.path.join(self.base_path, self.recipe.options['path'],
-                     'hello.txt')) as f:
-      self.assertEqual(f.read(), 'hello')
+                     'hello-form-urlencoded.txt')) as f:
+      self.assertEqual(f.read(), 'hello-form-urlencoded')
 
-    self.assertIn('hello.txt', requests.get(server_base_url).text)
+    self.assertIn('hello-form-urlencoded.txt', requests.get(server_base_url).text)
+    self.assertEqual(resp.text, 'Content written to hello-form-urlencoded.txt')
     self.assertEqual(
-        requests.get(server_base_url + '/hello.txt').text, 'hello')
+        requests.get(server_base_url + '/hello-form-urlencoded.txt').text, 'hello-form-urlencoded')
 
     # incorrect paths are refused
     for path in '/hello.txt', '../hello.txt':

software/backupserver/test/test.py

@@ -45,7 +45,7 @@ class TestBackupServer(InstanceTestCase):
     # Check that there is a RSS feed
     self.assertTrue('rss' in parameter_dict)
     self.assertTrue(parameter_dict['rss'].startswith(
-      'https://[%s]:9443/' % (self._ipv6_address, )
+      f'https://[{self._ipv6_address}]:9443/'
     ))
 
     result = requests.get(

software/beremiz-ide/test/test.py

@@ -24,7 +24,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from __future__ import unicode_literals
 
 import os
 import requests

software/caddy-frontend/test/setup.py

@@ -51,7 +51,6 @@ setup(name=name,
         # caucase needed to connect to the KeDiFa caucase
         'caucase',
         'cryptography',
-        'backports.lzma',
       ],
       zip_safe=True,
       test_suite='test',

software/caddy-frontend/test/test.py

@@ -33,7 +33,7 @@ from requests_toolbelt.adapters import source
 import json
 import multiprocessing
 import subprocess
-from unittest import skip
+from unittest import skip, expectedFailure
 import ssl
 from http.server import HTTPServer
 from http.server import BaseHTTPRequestHandler
@@ -51,18 +51,13 @@ import urllib.parse
 import socket
 import sys
 import logging
+import lzma
 import random
 import string
 from slapos.slap.standalone import SlapOSNodeInstanceError
 import caucase.client
 import caucase.utils
 
-
-try:
-    import lzma
-except ImportError:
-    from backports import lzma
-
 import datetime
 
 from cryptography import x509
@@ -307,7 +302,8 @@ class TestDataMixin(object):
     except IOError:
       test_data = ''
 
-    for replacement, value in list(data_replacement_dict.items()):
+    for replacement in sorted(data_replacement_dict.keys()):
+      value = data_replacement_dict[replacement]
       runtime_data = runtime_data.replace(value, replacement)
 
     maxDiff = self.maxDiff
@@ -448,7 +444,8 @@ class TestDataMixin(object):
         self.another_server_ca.certificate_pem.decode()),
       '@@another_server_ca.certificate_pem_double@@': unicode_escape(
         unicode_escape(self.another_server_ca.certificate_pem.decode())),
-      '@@getSoftwareURL@@': self.getSoftwareURL(),
+      # self.getSoftwareURL can contain other replacements so do it first
+      '@@00getSoftwareURL@@': self.getSoftwareURL(),
       '@@test_server_ca.certificate_pem@@': unicode_escape(
         self.test_server_ca.certificate_pem.decode()),
       '@@test_server_ca.certificate_pem_double@@': unicode_escape(
@@ -4451,6 +4448,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
         curl_command, out, err))
     return out, err
 
+  @expectedFailure
   def test_disabled_cookie_list(self):
     parameter_dict = self.assertSlaveBase('disabled-cookie-list')
     out, err = self._curl(

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt

@@ -20,7 +20,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -93,7 +93,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -130,7 +130,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test00cluster_request_instance_parameter_dict.txt

@@ -21,7 +21,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -94,7 +94,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -132,7 +132,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt

@@ -21,7 +21,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -94,7 +94,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -132,7 +132,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test00cluster_request_instance_parameter_dict.txt

@@ -22,7 +22,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -95,7 +95,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -134,7 +134,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt

@@ -21,7 +21,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -52,7 +52,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -88,7 +88,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt

@@ -19,7 +19,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -50,7 +50,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -86,7 +86,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt

@@ -20,7 +20,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -51,7 +51,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -88,7 +88,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00cluster_request_instance_parameter_dict.txt

@@ -20,7 +20,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -65,7 +65,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -102,7 +102,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt

@@ -20,7 +20,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -65,7 +65,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -102,7 +102,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt

@@ -24,7 +24,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -69,7 +69,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -106,7 +106,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -143,7 +143,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-3",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt

@@ -22,7 +22,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -763,7 +763,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -802,7 +802,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt

@@ -22,7 +22,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -81,7 +81,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -120,7 +120,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test00cluster_request_instance_parameter_dict.txt

@@ -23,7 +23,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -764,7 +764,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -804,7 +804,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt

@@ -22,7 +22,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -269,7 +269,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -308,7 +308,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt

@@ -22,7 +22,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -79,7 +79,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -118,7 +118,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt

@@ -23,7 +23,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -228,7 +228,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -268,7 +268,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt

@@ -23,7 +23,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -68,7 +68,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -108,7 +108,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt

@@ -23,7 +23,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "RootSoftwareInstance",
     "slave_instance_list": [
       {
@@ -68,7 +68,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "kedifa",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
@@ -108,7 +108,7 @@
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"

software/cloudooo/test/setup.py

@@ -45,7 +45,6 @@ setup(name=name,
         'slapos.cookbook',
         'slapos.libnetworkcache',
         'requests',
-        'six',
         'PyPDF2',
       ],
       zip_safe=True,

software/cloudooo/test/test.py

 ##############################################################################
-# coding: utf-8
 #
 # Copyright (c) 2020 Nexedi SA and Contributors. All Rights Reserved.
 #
@@ -31,8 +30,8 @@ import csv
 import multiprocessing
 import os
 import json
-import six.moves.xmlrpc_client as xmlrpclib
-import six.moves.urllib.parse as urllib_parse
+import xmlrpc.client as xmlrpclib
+import urllib.parse as urllib_parse
 import ssl
 import base64
 import io
@@ -63,6 +62,7 @@ class CloudOooTestCase(_CloudOooTestCase):
         context=ssl_context,
         allow_none=True,
     )
+    self.addCleanup(self.server('close'))
 
 
 def normalizeFontName(font_name):
@@ -111,16 +111,16 @@ class HTMLtoPDFConversionFontTestMixin:
   def test(self):
     actual_font_mapping_mapping = {}
     for font in self.expected_font_mapping:
-      src_html = '''
+      src_html = f'''
       <style>
           p {{ font-family: "{font}"; font-size: 20pt; }}
       </style>
       <p>the quick brown fox jumps over the lazy dog.</p>
       <p>THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG.</p>
-      '''.format(**locals())
+      '''
 
       pdf_data = self._convert_html_to_pdf(src_html)
-      pdf_reader = PyPDF2.PdfFileReader(io.BytesIO((pdf_data)))
+      pdf_reader = PyPDF2.PdfFileReader(io.BytesIO(pdf_data))
       self.assertEqual(
           self.pdf_producer,
           pdf_reader.getDocumentInfo()['/Producer'])
@@ -165,7 +165,7 @@ class TestWkhtmlToPDF(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase):
       'Liberation Sans Narrow': 'LiberationSansNarrow',
       'Liberation Serif': 'LiberationSerif',
       'Linux LibertineG': 'LiberationSans',
-      'OpenSymbol': set(['DejaVuSans', 'OpenSymbol']),
+      'OpenSymbol': {'DejaVuSans', 'OpenSymbol'},
       'Palatino': 'LiberationSans',
       'Roboto Black': 'LiberationSans',
       'Roboto Condensed Light': 'LiberationSans',
@@ -180,9 +180,9 @@ class TestWkhtmlToPDF(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase):
   }
 
   def _convert_html_to_pdf(self, src_html):
-    return base64.decodestring(
+    return base64.decodebytes(
         self.server.convertFile(
-            base64.encodestring(src_html.encode()).decode(),
+            base64.encodebytes(src_html.encode()).decode(),
             'html',
             'pdf',
             False,
@@ -238,9 +238,9 @@ class TestLibreoffice(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase):
   }
 
   def _convert_html_to_pdf(self, src_html):
-    return base64.decodestring(
+    return base64.decodebytes(
         self.server.convertFile(
-            base64.encodestring(src_html.encode()).decode(),
+            base64.encodebytes(src_html.encode()).decode(),
             'html',
             'pdf',
         ).encode())
@@ -251,10 +251,10 @@ class TestLibreOfficeTextConversion(CloudOooTestCase):
 
   def test_html_to_text(self):
     self.assertEqual(
-        base64.decodestring(
+        base64.decodebytes(
             self.server.convertFile(
-                base64.encodestring(
-                    u'<html>héhé</html>'.encode('utf-8')).decode(),
+                base64.encodebytes(
+                    '<html>héhé</html>'.encode()).decode(),
                 'html',
                 'txt',
             ).encode()),
@@ -274,19 +274,18 @@ class TestLibreOfficeCluster(CloudOooTestCase):
     global _convert_html_to_text
 
     def _convert_html_to_text(src_html):
-      return base64.decodestring(
+      return base64.decodebytes(
           self.server.convertFile(
-              base64.encodestring(src_html.encode()).decode(),
+              base64.encodebytes(src_html.encode()).decode(),
               'html',
               'txt',
           ).encode())
 
     pool = multiprocessing.Pool(5)
-    # TODO py3: use with pool
-    converted = pool.map(_convert_html_to_text,
+    with pool:
+      converted = pool.map(
+        _convert_html_to_text,
         ['<html><body>hello</body></html>'] * 100)
-    pool.terminate()
-    pool.join()
 
     self.assertEqual(converted, [codecs.BOM_UTF8 + b'hello\n'] * 100)
 
@@ -294,9 +293,8 @@ class TestLibreOfficeCluster(CloudOooTestCase):
     res = requests.get(
         urllib_parse.urljoin(self.url, '/haproxy;csv'),
         verify=False,
-        stream=True,
     )
-    reader = csv.DictReader(res.raw)
+    reader = csv.DictReader(io.StringIO(res.text))
     line_list = list(reader)
     # requests have been balanced
     total_hrsp_2xx = {
@@ -309,8 +307,8 @@ class TestLibreOfficeCluster(CloudOooTestCase):
       # ideally there should be 25% of requests on each backend, because we use
       # round robin scheduling, but it can happen that some backend take longer
       # to start, so we are tolerant here and just check that each backend
-      # process at least 15% of requests. 
-      self.assertGreater(total_hrsp_2xx[backend], 15)
+      # process at least one request.
+      self.assertGreater(total_hrsp_2xx[backend], 0)
     # no errors
     total_eresp = {
         line['svname']: int(line['eresp'] or 0)

software/dream/test/test.py

 ##############################################################################
-# coding: utf-8
 #
 # Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
 #

software/erp5/test/setup.py

@@ -24,7 +24,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from __future__ import absolute_import
 from setuptools import setup, find_packages
 
 version = '0.0.1.dev0'
@@ -49,7 +48,6 @@ setup(name=name,
         'psutil',
         'requests',
         'mysqlclient',
-        'backports.lzma',
         'cryptography',
         'pexpect',
         'pyOpenSSL',

software/erp5/test/test/__init__.py

@@ -25,7 +25,6 @@
 #
 ##############################################################################
 
-from __future__ import absolute_import
 import json
 import os
 

software/erp5/test/test/test_mariadb.py

 ##############################################################################
-# coding: utf-8
 #
 # Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
 #
@@ -26,11 +25,10 @@
 #
 ##############################################################################
 
-from __future__ import absolute_import
 import os
 import json
 import glob
-import six.moves.urllib.parse
+import urllib.parse
 import socket
 import sys
 import time
@@ -39,7 +37,7 @@ import datetime
 import subprocess
 import gzip
 
-from backports import lzma
+import lzma
 import MySQLdb
 
 from slapos.testing.utils import CrontabMixin
@@ -84,7 +82,7 @@ class MariaDBTestCase(ERP5InstanceTestCase):
     # type: () -> MySQLdb.connections.Connection
     connection_parameter_dict = json.loads(
         self.computer_partition.getConnectionParameterDict()['_'])
-    db_url = six.moves.urllib.parse.urlparse(connection_parameter_dict['database-list'][0])
+    db_url = urllib.parse.urlparse(connection_parameter_dict['database-list'][0])
     self.assertEqual('mysql', db_url.scheme)
 
     self.assertTrue(db_url.path.startswith('/'))
@@ -208,7 +206,7 @@ class TestMariaDB(MariaDBTestCase):
           """
           select * from test_utf8_collation where col1 = "a"
           """)
-      self.assertEqual(((u'à',),), cnx.store_result().fetch_row(maxrows=2))
+      self.assertEqual((('à',),), cnx.store_result().fetch_row(maxrows=2))
 
 
 class TestMroonga(MariaDBTestCase):
@@ -232,7 +230,7 @@ class TestMroonga(MariaDBTestCase):
           SELECT mroonga_normalize("ABCDあぃうぇ㍑")
           """)
       # XXX this is returned as bytes by mroonga/mariadb (this might be a bug)
-      self.assertEqual(((u'abcdあぃうぇリットル'.encode('utf-8'),),),
+      self.assertEqual((('abcdあぃうぇリットル'.encode(),),),
                        cnx.store_result().fetch_row(maxrows=2))
 
       if 0:
@@ -245,7 +243,7 @@ class TestMroonga(MariaDBTestCase):
             """
             SELECT mroonga_normalize("aBｃＤあぃウェ㍑", "NormalizerMySQLUnicodeCIExceptKanaCIKanaWithVoicedSoundMark")
             """)
-        self.assertEqual(((u'ABCDあぃうぇ㍑'.encode('utf-8'),),),
+        self.assertEqual((('ABCDあぃうぇ㍑'.encode(),),),
                          cnx.store_result().fetch_row(maxrows=2))
 
   def test_mroonga_full_text_normalizer(self):
@@ -282,7 +280,7 @@ class TestMroonga(MariaDBTestCase):
            WHERE MATCH (content) AGAINST ("+ﾌﾞﾗｯｸ" IN BOOLEAN MODE)
           """)
       self.assertEqual(
-          ((datetime.date(2013, 4, 23), u'ブラックコーヒーを飲んだ。'),),
+          ((datetime.date(2013, 4, 23), 'ブラックコーヒーを飲んだ。'),),
           cnx.store_result().fetch_row(maxrows=2),
       )
 

software/erp5/test/test/test_wcfs.py

@@ -16,7 +16,6 @@
 # See COPYING file for full licensing terms.
 # See https://www.nexedi.com/licensing for rationale and options.
 
-from __future__ import absolute_import
 import json
 import os.path
 import unittest
@@ -76,5 +75,5 @@ def lookupMount(zurl):
 
 # readfile returns content of file @path.
 def readfile(path):
-  with open(path, 'r') as f:
+  with open(path) as f:
     return f.read()

software/erp5/upgrade_test/setup.py

@@ -44,7 +44,6 @@ setup(name=name,
         'slapos.core',
         'supervisor',
         'slapos.libnetworkcache',
-        'typing; python_version<"3"',
       ],
       test_suite='test',
     )

software/erp5/upgrade_test/test.py

@@ -35,8 +35,8 @@ import tempfile
 import time
 
 import requests
-import six.moves.urllib as urllib
-import six.moves.xmlrpc_client
+import urllib.parse
+import xmlrpc.client
 import urllib3
 
 from slapos.grid.utils import md5digest
@@ -83,8 +83,8 @@ class ERP5UpgradeTestCase(SlapOSInstanceTestCase):
 
   @classmethod
   def setUpClass(cls):
-    # request and instanciate with old software url
-    super(ERP5UpgradeTestCase, cls).setUpClass()
+    # request and instantiate with old software url
+    super().setUpClass()
 
     cls.setUpOldInstance()
 
@@ -155,7 +155,7 @@ class TestERP5Upgrade(ERP5UpgradeTestCase):
 
     # wait for old site creation
     cls.session.get(
-      '{zope_base_url}/person_module'.format(zope_base_url=cls.zope_base_url),
+      f'{cls.zope_base_url}/person_module',
       auth=requests.auth.HTTPBasicAuth(
         username=param_dict['inituser-login'],
         password=param_dict['inituser-password'],
@@ -171,14 +171,10 @@ class TestERP5Upgrade(ERP5UpgradeTestCase):
       ssl_context = ssl.create_default_context()
       ssl_context.check_hostname = False
       ssl_context.verify_mode = ssl.CERT_NONE
-      erp5_xmlrpc_client = six.moves.xmlrpc_client.ServerProxy(
+      erp5_xmlrpc_client = xmlrpc.client.ServerProxy(
         cls.authenticated_zope_base_url,
         context=ssl_context,
       )
-      # BBB use as a context manager only on python3
-      if sys.version_info < (3, ):
-        yield erp5_xmlrpc_client
-      else:
       with erp5_xmlrpc_client:
         yield erp5_xmlrpc_client
 
@@ -188,7 +184,7 @@ class TestERP5Upgrade(ERP5UpgradeTestCase):
         try:
           custom.manage_addProduct.PythonScripts.manage_addPythonScript(
             script_id)
-        except six.moves.xmlrpc_client.ProtocolError as e:
+        except xmlrpc.client.ProtocolError as e:
           if e.errcode != 302:
             raise
         getattr(custom, script_id).ZPythonScriptHTML_editAction(

software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 8357771b70efd0740561b1cb46f6955e
 
 [template-deploy-test]
 filename = instance.cfg.in
-md5sum = c5db797980951b764b69aaa4b60a0380
+md5sum = 062e677990ca0cd0c0396993c58b46a2

software/erp5testnode/testsuite/deploy-test/instance-deploy-test.cfg.jinja2

@@ -22,7 +22,7 @@ parts =
 [request-kvm]
 <= slap-connection
 
-recipe = slapos.cookbook:request
+recipe = slapos.cookbook:request.serialised
 software-url = ${slap-connection:software-release-url}
 software-type = kvm
 name = test-kvm

software/erp5testnode/testsuite/deploy-test/instance.cfg.in

@@ -25,24 +25,22 @@ command =
 
 [runTestSuite]
 recipe = slapos.recipe.template:jinja2
-rendered = $${buildout:directory}/bin/$${:_buildout_section_name_}
-template = inline:
+output = $${buildout:directory}/bin/$${:_buildout_section_name_}
+inline =
   #!/bin/sh
-  export PATH=${python2.7-with-eggs:location}:$PATH
   exec ${buildout:bin-directory}/${runTestSuite_py:interpreter} ${:_profile_base_location_}/runTestSuite.py --partition_ipv4 {{ list(partition_ipv4)[0] }} --partition_path $${buildout:directory} --test_reference "{{ slapparameter_dict.get('image-to-test-url') }} {{ slapparameter_dict.get('script-to-test-url')}}" --test_location "${test-location:base}/{{ slapparameter_dict.get('test-relative-directory', 'playbook/roles/standalone-shared') }}" --python_interpreter=${buildout:bin-directory}/${runTestSuite_py:interpreter} "$@"
-mode = 0755
 context =
     key slapparameter_dict slap-configuration:configuration
     key partition_ipv4 slap-configuration:ipv4
 
 [switch_softwaretype]
 default = $${:deploy-test}
-deploy-test = dynamic-template-deploy-test:rendered
+deploy-test = dynamic-template-deploy-test:output
 
 [dynamic-template-deploy-test]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/instance-deploy-test.cfg.jinja2
-rendered = $${buildout:directory}/template-deploy-test.cfg
+url = ${:_profile_base_location_}/instance-deploy-test.cfg.jinja2
+output = $${buildout:directory}/template-deploy-test.cfg
 context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
@@ -52,4 +50,3 @@ context =
     raw in_vm_test_script_md5 ${deploy-script-controller-script:md5sum}
     raw waittime ${deploy-script-controller-script:waittime}
     raw tries ${deploy-script-controller-script:tries}
-mode = 0644

software/erp5testnode/testsuite/deploy-test/software.cfg

 [buildout]
 extends =
   buildout.hash.cfg
-  https://lab.nexedi.com/nexedi/slapos/raw/1.0.264/software/kvm/software.cfg
+  https://lab.nexedi.com/nexedi/slapos/raw/1.0.271/software/kvm/software.cfg
 parts =
   python-with-eggs
   template-deploy-test
@@ -15,23 +15,8 @@ eggs =
   requests
 interpreter = ${:_buildout_section_name_}
 
-[python2.7-with-eggs]
-# create interpreters named "python" and "python2.7" so that
-# instance profile can use them in $PATH
-recipe = plone.recipe.command
-
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-command =
-  rm -fr ${:location} &&
-  mkdir -p ${:location} &&
-  ln -s ${buildout:bin-directory}/${python-with-eggs:interpreter} ${:location}/python &&
-  ln -s ${buildout:bin-directory}/${python-with-eggs:interpreter} ${:location}/python2.7
-update-command = ${:command}
-
 [playbook]
 recipe = plone.recipe.command
-
 stop-on-error = true
 environment = export PATH=${tar:location}/bin:${gzip:location}/bin:$PATH
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -70,7 +55,6 @@ location = ${:_profile_base_location_}/${:filename}
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
-mode = 0644
 
 [versions]
 erp5.util = 0.4.69

software/fluentd/software-py2.cfg

-[buildout]
-extends =
-  software.cfg
-
-[python]
-part = python2.7

software/fluentd/test/setup.py

@@ -46,7 +46,6 @@ setup(name=name,
           'slapos.libnetworkcache',
           'erp5.util',
           'supervisor',
-          'six',
       ],
       zip_safe=True,
       test_suite='test',

software/fluentd/test/test.py

@@ -34,11 +34,10 @@ import struct
 import subprocess
 import tempfile
 import time
-import six
 import sys
 
-from six.moves.SimpleHTTPServer import SimpleHTTPRequestHandler
-from six.moves.socketserver import StreamRequestHandler, TCPServer
+from http.server import SimpleHTTPRequestHandler
+from socketserver import StreamRequestHandler, TCPServer
 
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 from slapos.testing.utils import findFreeTCPPort
@@ -49,8 +48,8 @@ FLUSH_INTERVAL = 1
 
 setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
-        os.path.join(os.path.dirname(__file__), '..',
-                     'software%s.cfg' % ("-py2" if six.PY2 else ""))))
+        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
+
 
 class FluentdTestCase(SlapOSInstanceTestCase):
   __partition_reference__ = 'fluentd'
@@ -135,11 +134,11 @@ class WendelinTutorialTestCase(FluentdTestCase):
     return subprocess.check_output(
       [self._fluentd_bin, '-c', conf_path, '--dry-run'],
       env={'GEM_PATH': self._gem_path},
-      universal_newlines=True,
+      text=True,
     )
 
   def _test_configuration(self, expected_str):
-    self.assertRegexpMatches(
+    self.assertRegex(
       self.read_fluentd_conf(self._conf),
       expected_str,
     )
@@ -168,12 +167,12 @@ class SensorConfTestCase(WendelinTutorialTestCase):
 
   @classmethod
   def sensor_conf(cls, script_path):
-    return '''\
+    return f'''\
 <source>
   @type exec
   tag tag.name
-  command %s %s
-  run_interval %ss
+  command {sys.executable} {script_path}
+  run_interval {FLUSH_INTERVAL}s
   <parse>
     keys pressure, humidity, temperature
   </parse>
@@ -182,25 +181,25 @@ class SensorConfTestCase(WendelinTutorialTestCase):
   @type forward
   <server>
     name myserver1
-    host %s
+    host {cls._ipv6_address}
   </server>
   <buffer>
     flush_mode immediate
   </buffer>
-</match>''' % (sys.executable, script_path, FLUSH_INTERVAL, cls._ipv6_address)
+</match>'''
 
   @classmethod
   def sensor_script(cls, measurementList):
-    return '''\
-#!/usr/bin/python
+    measurement_text = "\t".join(measurementList)
+    return f'''\
+#!{sys.executable}
 # -*- coding: utf-8 -*-
 
-print("%s")''' % "\t".join(measurementList)
+print("{measurement_text}")'''
 
   def test_configuration(self):
     self._test_configuration(
-      r'adding forwarding server \'myserver1\' host="%s" port=%s weight=60'
-      % (self._ipv6_address, FLUENTD_PORT)
+      fr'adding forwarding server \'myserver1\' host="{self._ipv6_address}" port={FLUENTD_PORT} weight=60'
     )
 
   def test_send_data(self):
@@ -229,25 +228,24 @@ class GatewayConfTestCase(WendelinTutorialTestCase):
 
   @classmethod
   def gateway_conf(cls, fluentd_port, wendelin_port):
-    return '''\
+    return f'''\
 <source>
   @type forward
-  port %s
-  bind %s
+  port {fluentd_port}
+  bind {cls._ipv6_address}
 </source>
 <match tag.name>
   @type wendelin
-  streamtool_uri http://[%s]:%s/erp5/portal_ingestion_policies/default
+  streamtool_uri http://[{cls._ipv6_address}]:{wendelin_port}/erp5/portal_ingestion_policies/default
   user      foo
   password  bar
   <buffer>
     flush_mode interval
     @type file
     path fluentd-buffer-file/
-    flush_interval %ss
+    flush_interval {FLUSH_INTERVAL}s
   </buffer>
-</match>''' % (fluentd_port, cls._ipv6_address, cls._ipv6_address,
-               wendelin_port, FLUSH_INTERVAL)
+</match>'''
 
   @classmethod
   def get_configuration(cls):

software/gitlab/test/test.py

@@ -27,7 +27,7 @@
 
 import os
 import logging
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 import requests
 

software/js-drone/README.md

+# Javascript drone #
+
+## Presentation ##
+
+* Deploy 3 different scripts (`cli.js`, `demo.js` and `manual-flight.js`) on a drone to fly it
+
+* Compile all required libraries to run flight scripts
+
+## Parameters ##
+
+* autopilot-ip: IPv4 address to identify the autpilot from the companion board
+
+* id: User chosen ID for the drone (must be unique in a swarm, will be used as an identifier in multicast communications)
+
+* is-a-simulation: Must be set to 'true' to automatically take off during simulation
+
+* leader-id: Id of the drone chosen to be the leader of the swarm
+
+* multicast-ipv6: IPv6 of the multicast group of the swarm
+
+* drone-id-list: Comma seperated list of the drone IDs of the swarm (recommanded to add the current drone ID)
+
+## How it works ##
+
+Run `quickjs binary location` `desired script location`

software/js-drone/buildout.hash.cfg

+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+[instance-profile]
+filename = instance.cfg
+md5sum = 99017d061d3be30746f6daef3a7bd8c4
+
+[cli]
+filename = cli.js
+md5sum = 33271aeec124301604fdd406f0b339d1
+
+[common]
+filename = common.js
+md5sum = bacc70f2683c279ba4e0751de616d4ff
+
+[demo]
+filename = demo.js
+md5sum = 31d8511e6d297643e65febe9a3ed2428
+
+[manual-flight]
+filename = manual-flight.js
+md5sum = 175813fc8b2f19f91dae27ad4e14ab03
+
+[pubsub]
+filename = pubsub.js
+md5sum = d949c9a6cdaaa94e7bdd22df5e52fbf4

software/js-drone/cli.js

+/*jslint indent2 */
+/*global console, std */
+
+import {
+  loiter,
+  setAirspeed,
+  setAltitude,
+  setTargetLatLong,
+  reboot
+} from "{{ qjs_wrapper }}"; //jslint-quiet
+import {
+  connect,
+  displayDronePositions,
+  land,
+  quit,
+  startPubsub,
+  takeOff
+} from "{{ common }}"; //jslint-quiet
+/*jslint-disable*/
+import * as std from "std";
+/*jslint-enable*/
+
+var running = false;
+const wrongParameters = displayMessage.bind(null, "Wrong parameters");
+
+function checkNumber(value, toExecute) {
+  return (
+    Number.isNaN(value)
+    ? wrongParameters
+    : toExecute.bind(null, value)
+  );
+}
+
+function displayMessage(message) {
+  console.log(message);
+  return 0;
+}
+
+function exit() {
+  running = false;
+  quit();
+  return 0;
+}
+
+function getInput() {
+  let undefined_cmd;
+  let altitude;
+  let cmd;
+  let latitude;
+  let longitude;
+  let s;
+  let speed;
+  
+  const help = `
+    connect
+    takeoff
+    land
+    goto(point)
+    gotoCoord(latitude, longitude)
+    altitude(altitude)
+    speed(speed)
+    positions
+    reboot
+    exit
+    help
+  `;
+
+  const f = std.fdopen(std.in, "r");
+  running = true;
+  while (running) {
+    std.printf("> ");
+    s = f.getline();
+    undefined_cmd = false;
+  
+    switch (s) {
+    case "altitude":
+      std.printf("Altitude: ");
+      altitude = parseFloat(f.getline());
+      cmd = checkNumber(altitude, setAltitude);
+      break;
+  
+    case "connect":
+      cmd = connect;
+      startPubsub();
+      break;
+  
+    case "exit":
+      cmd = exit;
+      break;
+  
+    case "gotoCoord":
+      std.printf("Latitude: ");
+      latitude = parseFloat(f.getline());
+      std.printf("Longitude: ");
+      longitude = parseFloat(f.getline());
+      cmd = checkNumber(longitude, checkNumber(latitude, setTargetLatLong));
+      break;
+  
+    case "help":
+      cmd = displayMessage.bind(null, help);
+      break;
+  
+    case "land":
+      cmd = land;
+      break;
+  
+    case "loiter":
+      cmd = loiter;
+      break;
+  
+    case "positions":
+      cmd = displayDronePositions;
+      break;
+  
+    case "reboot":
+      cmd = reboot;
+      break;
+  
+    case "speed":
+      std.printf("Speed: ");
+      speed = parseFloat(f.getline());
+      cmd = checkNumber(speed, setAirspeed);
+      break;
+  
+    case "takeoff":
+      cmd = takeOff.bind(null, 60);
+      break;
+  
+    default:
+      undefined_cmd = true;
+      cmd = displayMessage.bind(null, "    Undefined command");
+    }
+  
+    let ret = cmd();
+    if (ret) {
+      console.log("    [ERROR] function:\n", cmd, "\nreturn value:", ret);
+    }
+    else if (s !== "help" && !undefined_cmd) {
+      console.log("    Command successful");
+    }
+  };
+
+  f.close();
+}
+
+getInput();

software/js-drone/common.js

+/*jslint-disable*/
+{% set comma_separated_drone_id_list = ', '.join(drone_id_list.split()) -%}
+/*jslint-enable*/
+
+import {
+  arm,
+  doParachute,
+  getAltitude,
+  getLatitude,
+  getLongitude,
+  getYaw,
+  initPubsub,
+  setAltitude,
+  setTargetLatLong,
+  start,
+  stop,
+  stopPubsub,
+  takeOffAndWait,
+  Drone
+} from "{{ qjs_wrapper }}"; //jslint-quiet
+import {exit} from "std";
+import {sleep, Worker} from "os";
+
+const IP = "{{ autopilot_ip }}";
+const PORT = "7909";
+
+export const IS_LEADER = {{ is_leader }};
+export const LEADER_ID = {{ leader_id }};
+export const SIMULATION = {{ is_a_simulation }};
+
+export const EPSILON = 105;
+const EPSILON_YAW = 6;
+const EPSILON_ALTITUDE = 5;
+const TARGET_YAW = 0;
+export const ALTITUDE_DIFF = 30;
+
+const URL = "udp://" + IP + ":" + PORT;
+const LOG_FILE = "{{ log_dir }}/mavsdk-log";
+
+const droneIdList = [{{ comma_separated_drone_id_list }}];
+const droneDict = {};
+
+var pubsubRunning = false;
+var pubsubWorker;
+
+export function connect() {
+  console.log("Will connect to", URL);
+  exit_on_fail(start(URL, LOG_FILE, 60), "Failed to connect to " + URL);
+}
+
+export function distance(lat1, lon1, lat2, lon2) {
+  const R = 6371e3; // meters
+  const la1 = lat1 * Math.PI/180; // la, lo in radians
+  const la2 = lat2 * Math.PI/180;
+  const lo1 = lon1 * Math.PI/180;
+  const lo2 = lon2 * Math.PI/180;
+
+  //haversine formula
+  const sinLat = Math.sin((la2 - la1)/2);
+  const sinLon = Math.sin((lo2 - lo1)/2);
+  const h = sinLat*sinLat + Math.cos(la1)*Math.cos(la2)*sinLon*sinLon
+  return 2*R*Math.asin(Math.sqrt(h));
+}
+
+export function displayDronePositions() {
+  if(!pubsubRunning)
+    console.log("You must start pubsub first !");
+  else {
+    for (const [id, drone] of Object.entries(droneDict)) {
+      console.log(id, drone.latitude, drone.longitude, drone.altitudeAbs, drone.altitudeRel);
+    }
+  }
+  return 0;
+}
+
+function exit_on_fail(ret, msg) {
+  if(ret) {
+    console.log(msg);
+    quit();
+    exit(-1);
+  }
+}
+
+export function quit() {
+  stop();
+  if(pubsubRunning) {
+    stopPubsub();
+  }
+}
+
+export function goToAltitude(target_altitude, wait, go) {
+  if(go) {
+    exit_on_fail(
+      setAltitude(target_altitude),
+      `Failed to go to altitude ${target_altitude} m`
+    );
+  }
+
+  if(wait) {
+    waitForAltitude(target_altitude);
+  }
+}
+
+export function land() {
+  var yaw;
+
+  while(true) {
+    yaw = getYaw();
+    console.log(`[DEMO] Waiting for yaw... (${yaw} , ${TARGET_YAW})`);
+    if(Math.abs(yaw - TARGET_YAW) < EPSILON_YAW) {
+      break;
+    }
+    sleep(250);
+  }
+
+  console.log("[DEMO] Deploying parachute...");
+  exit_on_fail(doParachute(2), "Failed to deploy parachute");
+}
+
+export function setLatLong(latitude, longitude, target_altitude) {
+  var cur_latitude;
+  var cur_longitude;
+  var d;
+
+  if(target_altitude !== 0) {
+    setAltitude(target_altitude, false, true);
+  }
+
+  console.log(`Going to (${latitude}, ${longitude}) from
+                (${getLatitude()}, ${getLongitude()})`);
+  exit_on_fail(
+    setTargetLatLong(latitude, longitude),
+    `Failed to go to (${latitude}, ${longitude})`
+  );
+  sleep(500);
+
+  while(true) {
+    cur_latitude = getLatitude();
+    cur_longitude = getLongitude();
+    d = distance(cur_latitude, cur_longitude, latitude, longitude);
+    console.log(`Waiting for drone to get to destination (${d} m),
+    (${cur_latitude} , ${cur_longitude}), (${latitude}, ${longitude})`);
+    if(d < EPSILON) {
+      sleep(6000);
+      return;
+    }
+    sleep(1000);
+  }
+}
+
+export function startPubsub() {
+  pubsubWorker = new Worker("{{ pubsub_script }}");
+  pubsubWorker.onmessage = function(e) {
+    if (!e.data.publishing)
+      pubsubWorker.onmessage = null;
+  }
+
+  initPubsub(droneIdList.length);
+  for (let i = 0; i < droneIdList.length; i++) {
+    let id = droneIdList[i]
+    droneDict[id] = new Drone(id);
+    droneDict[id].init(i);
+  }
+
+  pubsubWorker.postMessage({ action: "run" });
+  pubsubRunning = true;
+  return droneDict;
+}
+
+export function takeOff(altitude) {
+  exit_on_fail(arm(), "Failed to arm");
+  takeOffAndWait();
+  goToAltitude(altitude, true, true);
+}
+
+function waitForAltitude(target_altitude) {
+  var altitude = getAltitude();
+  while(Math.abs(altitude - target_altitude) > EPSILON_ALTITUDE) {
+    console.log(
+      `[DEMO] Waiting for altitude... (${altitude} , ${target_altitude})`);
+    sleep(1000);
+    altitude = getAltitude();
+  }
+}

software/js-drone/demo.js

+/*jslint indent2 */
+/*global console */
+import {
+  getAltitude,
+  getAltitudeRel,
+  getInitialAltitude,
+  getLatitude,
+  getLongitude,
+  landed,
+  loiter,
+  setCheckpoint,
+  setTargetCoordinates
+} from "{{ qjs_wrapper }}"; //jslint-quiet
+import {sleep} from "os";
+import {
+  connect,
+  distance,
+  goToAltitude,
+  land,
+  quit,
+  setLatLong,
+  startPubsub,
+  takeOff,
+  ALTITUDE_DIFF,
+  IS_LEADER,
+  LEADER_ID,
+  SIMULATION
+} from "{{ common }}"; //jslint-quiet
+
+const FLIGH_ALTITUDE = 100;
+const PARACHUTE_ALTITUDE = 35;
+
+const checkpointList = [
+  {
+    "latitude": 45.64492790560583,
+    "longitude": 14.25334942966329,
+    "altitude": 585.1806861589965
+  },
+  {
+    "latitude": 45.64316335436476,
+    "longitude": 14.26332880184475,
+    "altitude": 589.8802607573035
+  },
+  {
+    "latitude": 45.64911917196595,
+    "longitude": 14.26214792790128,
+    "altitude": 608.6648153348965
+  },
+  {
+    "latitude": 45.64122685351364,
+    "longitude": 14.26590493128597,
+    "altitude": 606.1448368129072
+  },
+  {
+    "latitude": 45.64543355564817,
+    "longitude": 14.27242391207985,
+    "altitude": 630.0829598206344
+  },
+  {
+    "latitude": 45.6372792927328,
+    "longitude": 14.27533492411138,
+    "altitude": 616.1839898415284
+  },
+  {
+    "latitude": 45.64061299543953,
+    "longitude": 14.26161958465814,
+    "altitude": 598.0603137354178
+  },
+  {
+    "latitude": 45.64032340702919,
+    "longitude": 14.2682896662383,
+    "altitude": 607.1243119862851
+  }
+];
+
+const landingPoint = [
+  {
+    "latitude": 45.6398451,
+    "longitude": 14.2699217
+  }
+];
+
+let INITIAL_ALTITUDE;
+let START_ALTITUDE;
+
+var nextCheckpoint = 0;
+
+var distanceToLandingPoint = 100;
+
+var leaderAltitudeAbs;
+var leaderAltitudeRel;
+var leaderLatitude;
+var leaderLongitude;
+
+function followLeader(leaderId, initialAltitude, altitudeDiff) {
+  goToAltitude(START_ALTITUDE + ALTITUDE_DIFF, false, true);
+
+  while(droneDict[leaderId].altitudeAbs == 0) {
+    console.log("[DEMO] Waiting for leader to send its altitude");
+    sleep(1000);
+  }
+
+  while(droneDict[leaderId].altitudeAbs < initialAltitude) {
+    console.log(`[DEMO] Waiting for leader to reach altitude ${initialAltitude} (currently ${droneDict[leaderId].altitudeAbs})`);
+    sleep(1000);
+  }
+
+  console.log("[DEMO] Switching to following mode...\n");
+  do {
+    leaderAltitudeAbs = droneDict[leaderId].altitudeAbs;
+    leaderAltitudeRel = droneDict[leaderId].altitudeRel;
+    leaderLatitude = droneDict[leaderId].latitude;
+    leaderLongitude = droneDict[leaderId].longitude;
+
+    setTargetCoordinates(
+      leaderLatitude,
+      leaderLongitude,
+      leaderAltitudeAbs + altitudeDiff,
+      0
+    );
+    sleep(500);
+  } while(leaderAltitudeRel > PARACHUTE_ALTITUDE);
+
+  console.log("[DEMO] Stop following...\n");
+  nextCheckpoint = droneDict[leaderId].lastCheckpoint + 1;
+}
+
+function waitForAltitude(altitude) {
+  var curAltitude;
+  do {
+    sleep(1000);
+    curAltitude = getAltitude();
+    console.log(
+      `[DEMO] Waiting for altitude... (${curAltitude} , ${altitude})`);
+  }
+  while(curAltitude < altitude);
+}
+
+function waitForLanding() {
+  while(!landed()) {
+    sleep(1000);
+  }
+}
+
+console.log("[DEMO] Connecting...\n");
+connect();
+
+const droneDict = startPubsub();
+
+INITIAL_ALTITUDE = getInitialAltitude();
+START_ALTITUDE = INITIAL_ALTITUDE + FLIGH_ALTITUDE;
+
+if(SIMULATION) {
+  takeOff(START_ALTITUDE + 1);
+}
+
+waitForAltitude(START_ALTITUDE);
+
+console.log("[DEMO] Setting loiter mode...\n");
+loiter();
+sleep(3000);
+
+if(!IS_LEADER) {
+  followLeader(LEADER_ID, START_ALTITUDE, ALTITUDE_DIFF);
+}
+
+for (let i = nextCheckpoint; i < checkpointList.length; i++) {
+  console.log(`[DEMO] Going to Checkpoint ${i}\n`);
+  setLatLong(checkpointList[i].latitude, checkpointList[i].longitude, checkpointList[i].altitude + FLIGH_ALTITUDE);
+  console.log(`[DEMO] Reached Checkpoint ${i}\n`);
+  setCheckpoint(i);
+  sleep(30000);
+}
+
+console.log("[DEMO] Setting altitude...\n");
+goToAltitude(getAltitude() - getAltitudeRel() + PARACHUTE_ALTITUDE, true, true);
+
+if(!IS_LEADER) {
+  setLatLong(
+    checkpointList[checkpointList.length - 1].latitude,
+    checkpointList[checkpointList.length - 1].longitude,
+    0
+  );
+}
+
+while(distanceToLandingPoint > 20) {
+  console.log(`[DEMO] Waiting to reache landing point (current distance is ${distanceToLandingPoint})`);
+  distanceToLandingPoint = distance(getLatitude(), getLongitude(), landingPoint.latitude, landingPoint.longitude);
+}
+
+console.log("[DEMO] Landing...\n");
+land();
+
+waitForLanding();
+quit();

software/js-drone/instance.cfg

+[buildout]
+parts =
+  cli
+  demo
+  manual-flight
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+home = $${buildout:directory}
+etc = $${:home}/etc
+var = $${:home}/var
+log = $${:var}/log
+
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration
+computer = $${slap_connection:computer_id}
+partition = $${slap_connection:partition_id}
+url = $${slap_connection:server_url}
+key = $${slap_connection:key_file}
+cert = $${slap_connection:cert_file}
+
+[drone]
+recipe = slapos.recipe.build
+slapparameter-dict = $${slap-configuration:configuration}
+init =
+  options['autopilot-ip'] = options['slapparameter-dict'].get('autopilot_ip', '192.168.27.1')
+  options['id'] = options['slapparameter-dict'].get('id', '1')
+  options['is-a-simulation'] = options['slapparameter-dict'].get('is_a_simulation', 'false')
+  options['leader-id'] = options['slapparameter-dict'].get('leader_id', '1')
+  options['is-leader'] = 'true' if options['id'] == options['leader-id'] else 'false'
+  options['multicast-ipv6'] = options['slapparameter-dict'].get('multicast_ip', 'ff15::1111')
+  options['drone-id-list'] = options['slapparameter-dict'].get('drone_id_list', '')
+
+[js-dynamic-template]
+recipe = slapos.recipe.template:jinja2
+rendered = $${directory:etc}/$${:_buildout_section_name_}
+template = ${buildout:directory}/$${:_buildout_section_name_}.js
+extra-context =
+context =
+  raw qjs_wrapper ${qjs-wrapper:location}/lib/libqjswrapper.so
+  $${:extra-context}
+
+[common]
+<= js-dynamic-template
+extra-context =
+  key autopilot_ip drone:autopilot-ip
+  key drone_id_list drone:drone-id-list
+  key is_a_simulation drone:is-a-simulation
+  key is_leader drone:is-leader
+  key leader_id drone:leader-id
+  key log_dir directory:log
+  key pubsub_script pubsub:rendered
+
+[cli]
+<= js-dynamic-template
+extra-context =
+  key common common:rendered
+
+[demo]
+<= js-dynamic-template
+extra-context =
+  key common common:rendered
+
+[manual-flight]
+<= js-dynamic-template
+extra-context =
+  key common common:rendered
+
+[pubsub]
+<= js-dynamic-template
+extra-context =
+  key id drone:id
+  key ipv6 drone:multicast-ipv6

software/js-drone/manual-flight.js

+/*jslint indent2 */
+/*global console */
+import {
+  getAltitude,
+  getInitialAltitude,
+  landed,
+  loiter,
+  setTargetCoordinates
+} from "{{ qjs_wrapper }}"; //jslint-quiet
+import {sleep} from "os";
+import {
+  connect,
+  goToAltitude,
+  quit,
+  startPubsub,
+  takeOff,
+  ALTITUDE_DIFF,
+  IS_LEADER,
+  LEADER_ID,
+  SIMULATION
+} from "{{ common }}"; //jslint-quiet
+
+const FLIGH_ALTITUDE = 100;
+const PARACHUTE_ALTITUDE = 35;
+
+let INITIAL_ALTITUDE;
+let START_ALTITUDE;
+
+var leaderAltitudeAbs;
+var leaderAltitudeRel;
+var leaderLatitude;
+var leaderLongitude;
+
+function followLeader(leaderId, initialAltitude, altitudeDiff) {
+  goToAltitude(START_ALTITUDE + ALTITUDE_DIFF, false, true);
+
+  while(droneDict[leaderId].altitudeAbs == 0) {
+    console.log("[DEMO] Waiting for leader to send its altitude");
+    sleep(1000);
+  }
+
+  while(droneDict[leaderId].altitudeAbs < initialAltitude) {
+    console.log(`[DEMO] Waiting for leader to reach altitude ${initialAltitude} (currently ${droneDict[leaderId].altitudeAbs})`);
+    sleep(1000);
+  }
+
+  console.log("[DEMO] Switching to following mode...\n");
+  do {
+    leaderAltitudeAbs = droneDict[leaderId].altitudeAbs;
+    leaderAltitudeRel = droneDict[leaderId].altitudeRel;
+    leaderLatitude = droneDict[leaderId].latitude;
+    leaderLongitude = droneDict[leaderId].longitude;
+
+    setTargetCoordinates(
+      leaderLatitude,
+      leaderLongitude,
+      leaderAltitudeAbs + altitudeDiff,
+      0
+    );
+    sleep(500);
+  } while(leaderAltitudeRel > PARACHUTE_ALTITUDE);
+
+  console.log("[DEMO] Stop following...\n");
+}
+
+function waitForAltitude(altitude) {
+  var curAltitude;
+  do {
+    sleep(1000);
+    curAltitude = getAltitude();
+    console.log(
+      `[DEMO] Waiting for altitude... (${curAltitude} , ${altitude})`);
+  }
+  while(curAltitude < altitude);
+}
+
+function waitForLanding() {
+  while(!landed()) {
+    sleep(1000);
+  }
+}
+
+const droneDict = startPubsub();
+
+console.log("[DEMO] Connecting...\n");
+connect();
+
+while(getInitialAltitude() == 0) {
+  console.log("[DEMO] Waiting for first telemetry\n");
+  sleep(1000);
+}
+
+INITIAL_ALTITUDE = getInitialAltitude();
+START_ALTITUDE = INITIAL_ALTITUDE + FLIGH_ALTITUDE;
+
+if(SIMULATION) {
+  takeOff(START_ALTITUDE + 1);
+}
+
+waitForAltitude(START_ALTITUDE);
+
+console.log("[DEMO] Setting loiter mode...\n");
+loiter();
+sleep(3000);
+
+if(!IS_LEADER) {
+  followLeader(LEADER_ID, START_ALTITUDE, ALTITUDE_DIFF);
+}
+
+console.log("[DEMO] Loitering until manual intructions are given\n")
+
+waitForLanding();
+quit();

software/js-drone/pubsub.js

+import {runPubsub} from "{{ qjs_wrapper }}";
+import {Worker} from "os";
+
+const PORT = "4840";
+const IPV6 = "{{ ipv6 }}";
+
+var parent = Worker.parent;
+
+function handle_msg(e) {
+  switch(e.data.action) {
+    case "run":
+      runPubsub(IPV6, PORT, "eth0", {{ id }});
+      parent.postMessage({running: false});
+      parent.onmessage = null;
+      break;
+    default:
+      console.log("Undefined action from parent: ", e.data.action);
+  }
+}
+
+parent.onmessage = handle_msg;

software/js-drone/software.cfg

+[buildout]
+extends =
+  buildout.hash.cfg
+  ../../stack/slapos.cfg
+  ../../component/qjs-wrapper/buildout.cfg
+
+parts =
+    instance-profile
+    common
+    cli
+    demo
+    manual-flight
+    pubsub
+    slapos-cookbook
+
+[download-file-base]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:filename}
+destination = ${buildout:directory}/${:filename}
+
+[instance-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/template.cfg
+
+[common]
+<= download-file-base
+
+[cli]
+<= download-file-base
+
+[demo]
+<= download-file-base
+
+[manual-flight]
+<= download-file-base
+
+[pubsub]
+<= download-file-base

software/kvm/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 7e90da1f6dac4233e1aa3248f48e357c
+md5sum = a7978940fb9cdcc4e1ec33015ba640ba
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = ff9fb2378a48d1ca8c72f6a87d3a0221
+md5sum = 150285957daa256420d2d73519277420
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
@@ -51,7 +51,7 @@ md5sum = e041e8011ad2ec7f104be173ef76f5e9
 
 [template-ansible-promise]
 filename = template/ansible-promise.in
-md5sum = a8cf453d20f01c707f02c4b4014580d8
+md5sum = 6328f99728284847b8dd1146aadeae1b
 
 [template-kvm-run]
 filename = template/template-kvm-run.in
@@ -78,16 +78,16 @@ filename = instance-kvm-http.cfg.in
 md5sum = 438192aab9f11e40dc521b46a4854dcf
 
 [image-download-controller]
-filename = template/image-download-controller.py
-md5sum = 3cc10323fd4d2db4cfbac536b66eae7c
+filename = template/image-download-controller.py.in
+md5sum = dc822ddd7dc987bf808a64a18ba11fd0
 
 [image-download-config-creator]
-filename = template/image-download-config-creator.py
-md5sum = 22ed19d9b8f7b983c97c52caa686bcd7
+filename = template/image-download-config-creator.py.in
+md5sum = b74b9d4829fe2c2f7122125cf87d29cd
 
 [whitelist-firewall-download-controller]
-filename = template/whitelist-firewall-download-controller.py
-md5sum = bc64e29546833817636261d1b28aa6dc
+filename = template/whitelist-firewall-download-controller.py.in
+md5sum = b4f6ffef08685bace1b9c01a3bd2620d
 
 [whitelist-domains-default]
 filename = template/whitelist-domains-default

software/kvm/instance-kvm.cfg.jinja2

@@ -1026,6 +1026,7 @@ extensions = jinja2.ext.do
 context =
   raw logs ${directory:public}/ansible
   raw name {{ name }}
+  raw python_executable ${buildout:executable}
 
 [ansible-vm-promise]
 <= monitor-promise-base

software/kvm/instance.cfg.in

@@ -83,9 +83,9 @@ extra-context =
   raw dcron_executable_location ${dcron:location}/sbin/crond
   raw debian_amd64_netinst_location ${debian-amd64-bullseye-netinst.iso:target}
   raw whitelist_domains_default ${whitelist-domains-default:target}
-  raw whitelist_firewall_download_controller ${whitelist-firewall-download-controller:target}
-  raw image_download_controller ${image-download-controller:target}
-  raw image_download_config_creator ${image-download-config-creator:target}
+  raw whitelist_firewall_download_controller ${whitelist-firewall-download-controller:output}
+  raw image_download_controller ${image-download-controller:output}
+  raw image_download_config_creator ${image-download-config-creator:output}
   raw logrotate_cfg ${template-logrotate-base:output}
   raw novnc_location ${noVNC:location}
   raw netcat_bin ${netcat:location}/bin/netcat

software/kvm/software.cfg

@@ -61,9 +61,16 @@ scripts =
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
 
-[template]
+[template-base]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
+
+[template-base-python]
+<= template-base
+output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:_buildout_section_name_}.py
+
+[template]
+<= template-base
 output = ${buildout:directory}/template.cfg
 
 [template-kvm]
@@ -118,13 +125,13 @@ context =
     key template_apache_conf template-apache-conf:target
 
 [image-download-controller]
-<= download-base
+<= template-base-python
 
 [image-download-config-creator]
-<= download-base
+<= template-base-python
 
 [whitelist-firewall-download-controller]
-<= download-base
+<= template-base-python
 
 [whitelist-domains-default]
 <= download-base

software/kvm/template/ansible-promise.in

-#!/usr/bin/env python
+#!{{ python_executable }}
 
 # Parse Ansible result log file and define if execution succeed or not
 

software/kvm/template/image-download-config-creator.py → software/kvm/template/image-download-config-creator.py.in

-#!/usr/bin/env python
+#!${buildout:executable}
 
 import hashlib
 import json

software/kvm/template/image-download-controller.py → software/kvm/template/image-download-controller.py.in

-#!/usr/bin/env python
+#!${buildout:executable}
 
 import hashlib
 import json

software/kvm/template/whitelist-firewall-download-controller.py → software/kvm/template/whitelist-firewall-download-controller.py.in

-#!/usr/bin/env python
+#!${buildout:executable}
 
 import os
 import subprocess

software/kvm/test/setup.py

@@ -48,7 +48,6 @@ setup(name=name,
           'erp5.util',
           'supervisor',
           'psutil',
-          'six',
       ],
       zip_safe=True,
       test_suite='test',

software/mca/dep--mca--static.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# "dep--" means it does not compile all the building dependencies
+# "--static" indicates that it is the statically linked version of it
+
+[buildout]
+# delete slapos.rebootstrap as we use python from the host
+extensions =
+  slapos.extension.strip
+  slapos.extension.shared
+
+extends =
+  mca--static.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+  mca
+
+[python2.7]
+recipe =
+environment =
+location = /usr
+
+[python3]
+recipe =
+environment =
+location = /usr
+
+[golang1.17]
+recipe  = plone.recipe.command
+command = ${:location}/bin/go env -w GOPATH=${buildout:directory}/go
+environment =
+location = /usr
+
+[cmake]
+recipe =
+environment =
+location = /usr

software/mca/dep--mca.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# "dep--" means it does not compile all the building dependencies
+
+[buildout]
+# delete slapos.rebootstrap as we use python from the host
+extensions =
+  slapos.extension.strip
+  slapos.extension.shared
+
+extends =
+  software.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+  mca
+
+[python2.7]
+recipe =
+environment =
+location = /usr
+
+[python3]
+recipe =
+environment =
+location = /usr
+
+[golang1.17]
+recipe  = plone.recipe.command
+command = ${:location}/bin/go env -w GOPATH=${buildout:directory}/go
+environment =
+location = /usr
+
+[cmake]
+recipe =
+environment =
+location = /usr

software/mca/mca--static.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+# "--static" indicates that it is the statically linked version of it
+
+[buildout]
+extends =
+  software.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+  mca
+
+
+# ENABLE STATIC LINKING
+# note: as a general matter, one has to tweak each dependency by hand to get a static executable
+[mca]
+# static version:
+# WARNING: LINK_STATIC only has to be defined to switch to static linking (so it does so even if the value is "NO", "OFF" or "FALSE"). Just don't define it in order to deactivate the option.
+environment +=
+  ZLIB_PATH=${zlib:location}
+  LINK_STATIC=dumb_value
+
+[fmtlib]
+# static version:
+shared = false
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DFMT_TEST=OFF
+  -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE

software/mca/software.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+
+[buildout]
+extends =
+  ../../component/fluentbit-plugin-wendelin/buildout.cfg
+  ../../component/mca/buildout.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+  mca
+
+[golang1.17]
+# Using "./make.bash" instead of "./all.bash" disables golang tests. Some of these tests attempt to use the network, which fails on OBS' VM.
+# A less radical way to fix the issue may be investigated in the future.
+make-targets = cd src && unset GOBIN && ./make.bash && cp -alf .. ${:location}
+post-install =
+  ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
+# This line relocates the golang cached modules directory so that the modules are sent to OBS along with the code to compile.
+  ${:location}/bin/go env -w GOPATH=${buildout:directory}/go

software/metabase/test/setup.py

@@ -45,7 +45,6 @@ setup(name=name,
         'slapos.cookbook',
         'slapos.libnetworkcache',
         'supervisor',
-        'six',
         'requests'
         ],
       zip_safe=True,

software/metabase/test/test.py

 ##############################################################################
-# coding: utf-8
 #
 # Copyright (c) 2020 Nexedi SA and Contributors. All Rights Reserved.
 #
@@ -28,7 +27,7 @@
 
 import os
 import json
-from six.moves.urllib import parse
+from urllib import parse
 import requests
 
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass

software/slapos-master/test/test/test_erp5.py

@@ -28,11 +28,11 @@
 import os
 import json
 import glob
-import urlparse
+import urllib.parse
 import socket
 import time
 import re
-import BaseHTTPServer
+import http.server
 import multiprocessing
 import subprocess
 
@@ -44,7 +44,7 @@ from . import setUpModule
 setUpModule # pyflakes
 
 
-class TestPublishedURLIsReachableMixin(object):
+class TestPublishedURLIsReachableMixin:
   """Mixin that checks that default page of ERP5 is reachable.
   """
 
@@ -52,7 +52,7 @@ class TestPublishedURLIsReachableMixin(object):
     # We access ERP5 trough a "virtual host", which should make
     # ERP5 produce URLs using https://virtual-host-name:1234/virtual_host_root
     # as base.
-    virtual_host_url = urlparse.urljoin(
+    virtual_host_url = urllib.parse.urljoin(
         base_url,
         '/VirtualHostBase/https/virtual-host-name:1234/{}/VirtualHostRoot/_vh_virtual_host_root/'
         .format(site_id))
@@ -72,7 +72,7 @@ class TestPublishedURLIsReachableMixin(object):
                 total=60,
                 backoff_factor=.5,
                 status_forcelist=(404, 500, 503))))
-
+    with session:
       r = session.get(virtual_host_url, verify=verify, allow_redirects=False)
       self.assertEqual(r.status_code, requests.codes.found)
       # access on / are redirected to login form, with virtual host preserved
@@ -80,7 +80,7 @@ class TestPublishedURLIsReachableMixin(object):
 
       # login page can be rendered and contain the text "ERP5"
       r = session.get(
-        urlparse.urljoin(base_url, '{}/login_form'.format(site_id)),
+          urllib.parse.urljoin(base_url, f'{site_id}/login_form'),
           verify=verify,
           allow_redirects=False,
       )
@@ -134,7 +134,7 @@ class TestJupyter(ERP5InstanceTestCase, TestPublishedURLIsReachableMixin):
     param_dict = self.getRootPartitionConnectionParameterDict()
 
     self.assertEqual(
-      'https://[%s]:8888/tree' % self._ipv6_address,
+      f'https://[{self._ipv6_address}]:8888/tree',
       param_dict['jupyter-url']
     )
 
@@ -172,7 +172,7 @@ class TestApacheBalancerPorts(ERP5InstanceTestCase):
     }
 
   def checkValidHTTPSURL(self, url):
-    parsed = urlparse.urlparse(url)
+    parsed = urllib.parse.urlparse(url)
     self.assertEqual(parsed.scheme, 'https')
     self.assertTrue(parsed.hostname)
     self.assertTrue(parsed.port)
@@ -182,16 +182,16 @@ class TestApacheBalancerPorts(ERP5InstanceTestCase):
     param_dict = self.getRootPartitionConnectionParameterDict()
     for family_name in ('family1', 'family2'):
       self.checkValidHTTPSURL(
-          param_dict['family-{family_name}'.format(family_name=family_name)])
+          param_dict[f'family-{family_name}'])
       self.checkValidHTTPSURL(
-          param_dict['family-{family_name}-v6'.format(family_name=family_name)])
+          param_dict[f'family-{family_name}-v6'])
 
   def test_published_test_runner_url(self):
     # each family's also a list of test test runner URLs, by default 3 per family
     param_dict = self.getRootPartitionConnectionParameterDict()
     for family_name in ('family1', 'family2'):
       family_test_runner_url_list = param_dict[
-          '{family_name}-test-runner-url-list'.format(family_name=family_name)]
+          f'{family_name}-test-runner-url-list']
       self.assertEqual(3, len(family_test_runner_url_list))
       for url in family_test_runner_url_list:
         self.checkValidHTTPSURL(url)
@@ -209,23 +209,23 @@ class TestApacheBalancerPorts(ERP5InstanceTestCase):
     # normal access on ipv4 and ipv6 and test runner access on ipv4 only
     with self.slap.instance_supervisor_rpc as supervisor:
       all_process_info = supervisor.getAllProcessInfo()
-    process_info, = [p for p in all_process_info if p['name'] == 'apache']
+    process_info, = (p for p in all_process_info if p['name'] == 'apache')
     apache_process = psutil.Process(process_info['pid'])
     self.assertEqual(
         sorted([socket.AF_INET] * 4 + [socket.AF_INET6] * 2),
-        sorted([
+        sorted(
             c.family
             for c in apache_process.connections()
             if c.status == 'LISTEN'
-        ]))
+        ))
 
   def test_haproxy_listen(self):
     # There is one haproxy per family
     with self.slap.instance_supervisor_rpc as supervisor:
       all_process_info = supervisor.getAllProcessInfo()
-    process_info, = [
+    process_info, = (
         p for p in all_process_info if p['name'].startswith('haproxy-')
-    ]
+    )
     haproxy_process = psutil.Process(process_info['pid'])
     self.assertEqual([socket.AF_INET, socket.AF_INET], [
         c.family for c in haproxy_process.connections() if c.status == 'LISTEN'
@@ -290,8 +290,8 @@ class TestZopeNodeParameterOverride(ERP5InstanceTestCase, TestPublishedURLIsReac
       zodb["pool-timeout"] = "10m"
       storage["storage"] = "root"
       storage["server"] = zeo_addr
-      with open('%s/etc/zope-%s.conf' % (partition, zope)) as f:
-        conf = map(str.strip, f.readlines())
+      with open(f'{partition}/etc/zope-{zope}.conf') as f:
+        conf = list(map(str.strip, f.readlines()))
       i = conf.index("<zodb_db root>") + 1
       conf = iter(conf[i:conf.index("</zodb_db>", i)])
       for line in conf:
@@ -300,23 +300,23 @@ class TestZopeNodeParameterOverride(ERP5InstanceTestCase, TestPublishedURLIsReac
             if line == '</zeoclient>':
               break
             checkParameter(line, storage)
-          for k, v in storage.iteritems():
+          for k, v in storage.items():
             self.assertIsNone(v, k)
           del storage
         else:
           checkParameter(line, zodb)
-      for k, v in zodb.iteritems():
+      for k, v in zodb.items():
         self.assertIsNone(v, k)
 
     partition = self.getComputerPartitionPath('zope-a')
-    for zope in xrange(3):
+    for zope in range(3):
       checkConf({
           "cache-size-bytes": "20MB",
         }, {
           "cache-size": "50MB",
         })
     partition = self.getComputerPartitionPath('zope-bb')
-    for zope in xrange(5):
+    for zope in range(5):
       checkConf({
           "cache-size-bytes": "500MB" if zope else 1<<20,
         }, {
@@ -332,19 +332,20 @@ def popenCommunicate(command_list, input_=None, **kwargs):
     popen.kill()
   if popen.returncode != 0:
     raise ValueError(
-      'Issue during calling %r, result was:\n%s' % (command_list, result))
+      f'Issue during calling {command_list!r}, result was:\n{result}')
   return result
 
 
-class TestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+class TestHandler(http.server.BaseHTTPRequestHandler):
   def do_GET(self):
     self.send_response(200)
-
-    response = {
+    response = json.dumps(
+        {
             'Path': self.path,
-      'Incoming Headers': self.headers.dict
-    }
-    response = json.dumps(response, indent=2)
+            'Incoming Headers': {k.lower(): v for k, v in self.headers.items()},
+        },
+        indent=2,
+    ).encode('utf-8')
     self.end_headers()
     self.wfile.write(response)
 
@@ -352,7 +353,7 @@ class TestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 class TestDeploymentScriptInstantiation(ERP5InstanceTestCase):
   """This check deployment script like instantiation
 
-  Low level assertions are done here in roder to assure that
+  Low level assertions are done here in order to assure that
   https://lab.nexedi.com/nexedi/slapos.package/blob/master/playbook/
   slapos-master-standalone.yml
   works correctly
@@ -426,8 +427,8 @@ class TestDeploymentScriptInstantiation(ERP5InstanceTestCase):
       1,
       len(backend_apache_configuration_list)
     )
-    backend_apache_configuration = open(
-      backend_apache_configuration_list[0]).read()
+    with open(backend_apache_configuration_list[0]) as f:
+      backend_apache_configuration = f.read()
     self.assertIn(
       'SSLVerifyClient require',
       backend_apache_configuration
@@ -452,7 +453,7 @@ class TestDeploymentScriptInstantiation(ERP5InstanceTestCase):
     common_name = 'TEST-SSL-AUTH'
     popenCommunicate([
       'openssl', 'req', '-utf8', '-nodes', '-config', openssl_config, '-new',
-      '-keyout', key, '-out', csr, '-days', '3650'], '%s\n' % (common_name,),
+      '-keyout', key, '-out', csr, '-days', '3650'], f'{common_name}\n'.encode(),
       stdin=subprocess.PIPE)
     popenCommunicate([
       'openssl', 'ca', '-utf8', '-days', '3650', '-batch', '-config',
@@ -464,11 +465,14 @@ class TestDeploymentScriptInstantiation(ERP5InstanceTestCase):
     ip, port = re.search(
       r'.*http:\/\/(.*):(\d*)\/.*', portal_slap_line).groups()
     port = int(port)
-    server = BaseHTTPServer.HTTPServer((ip, port), TestHandler)
+    server = http.server.HTTPServer((ip, port), TestHandler)
     server_process = multiprocessing.Process(
       target=server.serve_forever, name='HTTPServer')
     server_process.start()
-    try:
+    self.addCleanup(server_process.terminate)
+    self.addCleanup(server_process.join, 10)
+    server.socket.close()
+
     # assert that accessing the service endpoint results with certificate
     # authentication and proper information extraction
     result_json = requests.get(
@@ -482,6 +486,3 @@ class TestDeploymentScriptInstantiation(ERP5InstanceTestCase):
       '/erp5/portal_slap/',
       result_json['Path']
     )
-    finally:
-      server_process.join(10)
-      server_process.terminate()

software/slapos-master/test/test/test_mariadb.py

 ##############################################################################
-# coding: utf-8
 #
 # Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
 #
@@ -29,7 +28,7 @@
 import os
 import json
 import glob
-import urlparse
+import urllib.parse
 import socket
 import sys
 import time
@@ -38,7 +37,7 @@ import datetime
 import subprocess
 import gzip
 
-from backports import lzma
+import lzma
 import MySQLdb
 
 from slapos.testing.utils import CrontabMixin
@@ -80,7 +79,7 @@ class MariaDBTestCase(ERP5InstanceTestCase):
   def getDatabaseConnection(self):
     connection_parameter_dict = json.loads(
         self.computer_partition.getConnectionParameterDict()['_'])
-    db_url = urlparse.urlparse(connection_parameter_dict['database-list'][0])
+    db_url = urllib.parse.urlparse(connection_parameter_dict['database-list'][0])
     self.assertEqual('mysql', db_url.scheme)
 
     self.assertTrue(db_url.path.startswith('/'))
@@ -91,6 +90,8 @@ class MariaDBTestCase(ERP5InstanceTestCase):
         host=db_url.hostname,
         port=db_url.port,
         db=database_name,
+        use_unicode=True,
+        charset='utf8mb4'
     )
 
 
@@ -106,7 +107,7 @@ class TestCrontabs(MariaDBTestCase, CrontabMixin):
             'mariadb-full',
             '20500101000000.sql.gz',
         ),
-        'r') as dump:
+        'rt') as dump:
       self.assertIn('CREATE TABLE', dump.read())
 
   def test_logrotate_and_slow_query_digest(self):
@@ -148,7 +149,7 @@ class TestCrontabs(MariaDBTestCase, CrontabMixin):
         'slowquery_digest',
         'slowquery_digest.txt-2050-01-01.xz',
     )
-    with lzma.open(slow_query_report, 'r') as f:
+    with lzma.open(slow_query_report, 'rt') as f:
       # this is the hash for our "select sleep(n)" slow query
       self.assertIn("ID 0xF9A57DD5A41825CA", f.read())
 
@@ -170,7 +171,7 @@ class TestCrontabs(MariaDBTestCase, CrontabMixin):
       subprocess.check_output('faketime 2050-01-01 %s' % check_slow_query_promise_plugin['command'], 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
@@ -220,7 +221,7 @@ class TestMroonga(MariaDBTestCase):
           """
           SELECT mroonga_normalize("ABCDあぃうぇ㍑")
           """)
-      self.assertEqual((('abcdあぃうぇリットル',),),
+      self.assertEqual((('abcdあぃうぇリットル'.encode(),),),
                        cnx.store_result().fetch_row(maxrows=2))
 
       if 0:
@@ -233,7 +234,7 @@ class TestMroonga(MariaDBTestCase):
             """
             SELECT mroonga_normalize("aBｃＤあぃウェ㍑", "NormalizerMySQLUnicodeCIExceptKanaCIKanaWithVoicedSoundMark")
             """)
-        self.assertEqual((('ABCDあぃうぇ㍑',),),
+        self.assertEqual((('ABCDあぃうぇ㍑'.encode(),),),
                          cnx.store_result().fetch_row(maxrows=2))
 
   def test_mroonga_full_text_normalizer(self):
@@ -321,7 +322,7 @@ class TestMroonga(MariaDBTestCase):
     cnx = self.getDatabaseConnection()
     with contextlib.closing(cnx):
       cnx.query("SELECT mroonga_command('register token_filters/stem')")
-      self.assertEqual((('true',),), cnx.store_result().fetch_row(maxrows=2))
+      self.assertEqual(((b'true',),), cnx.store_result().fetch_row(maxrows=2))
       cnx.query(
           """
           CREATE TABLE memos (

software/slapos-master/test/test/test_wcfs.py

@@ -75,5 +75,5 @@ def lookupMount(zurl):
 
 # readfile returns content of file @path.
 def readfile(path):
-  with open(path, 'r') as f:
+  with open(path) as f:
     return f.read()

software/slapos-sr-testing/README.md

@@ -17,7 +17,6 @@ changes to the code, run tests and publish changes.
 
 ```bash
 # install this software release and request an instance
-# use software-py3.cfg instead of software.cfg if the SR you want to test is written in Python 3
 SR=https://lab.nexedi.com/nexedi/slapos/raw/1.0/software/slapos-sr-testing/software.cfg
 COMP=slaprunner
 INSTANCE_NAME=$COMP

software/slapos-sr-testing/software-py3.cfg

-[buildout]
-extends =
-  software.cfg
-
-[python]
-part = python3
-
-[python-interpreter]
-extra-eggs +=
-# plantuml 0.3.0 is only available for Python 3
-  ${slapos.test.plantuml-setup:egg}
-
-[template]
-extra =
-# The following list is for SR whose buildout runs only with Python 3.
-  caddy-frontend ${slapos.test.caddy-frontend-setup:setup}
-  caucase ${slapos.test.caucase-setup:setup}
-  erp5testnode ${slapos.test.erp5testnode-setup:setup}
-  galene ${slapos.test.galene-setup:setup}
-  grafana ${slapos.test.grafana-setup:setup}
-  headless-chromium ${slapos.test.headless-chromium-setup:setup}
-  helloworld ${slapos.test.helloworld-setup:setup}
-  html5as ${slapos.test.html5as-setup:setup}
-  html5as-base ${slapos.test.html5as-base-setup:setup}
-  htmlvalidatorserver ${slapos.test.htmlvalidatorserver-setup:setup}
-  hugo ${slapos.test.hugo-setup:setup}
-  jscrawler ${slapos.test.jscrawler-setup:setup}
-  jstestnode ${slapos.test.jstestnode-setup:setup}
-  jupyter ${slapos.test.jupyter-setup:setup}
-  kvm ${slapos.test.kvm-setup:setup}
-  matomo ${slapos.test.matomo-setup:setup}
-  metabase ${slapos.test.metabase-setup:setup}
-  monitor ${slapos.test.monitor-setup:setup}
-  nextcloud ${slapos.test.nextcloud-setup:setup}
-  nginx-push-stream ${slapos.test.nginx-push-stream-setup:setup}
-  ors-amarisoft ${slapos.test.ors-amarisoft-setup:setup}
-  plantuml ${slapos.test.plantuml-setup:setup}
-  powerdns ${slapos.test.powerdns-setup:setup}
-  proftpd ${slapos.test.proftpd-setup:setup}
-  repman ${slapos.test.repman-setup:setup}
-  restic-rest-server ${slapos.test.restic_rest_server-setup:setup}
-  seleniumserver ${slapos.test.seleniumserver-setup:setup}
-  theia ${slapos.test.theia-setup:setup}
-  turnserver ${slapos.test.turnserver-setup:setup}

software/slapos-sr-testing/software.cfg

@@ -27,9 +27,6 @@ parts =
 
 shared-part-list =
 
-[python]
-part = python2.7
-
 [setup-develop-egg]
 recipe = zc.recipe.egg:develop
 
@@ -250,8 +247,7 @@ egg = slapos.core
 setup = ${slapos.core-repository:location}
 
 [python-interpreter]
-eggs += ${:extra-eggs}
-extra-eggs =
+eggs +=
   ${lxml-python:egg}
   ${python-PyYAML:egg}
   ${slapos.core-setup:egg}
@@ -289,10 +285,11 @@ extra-eggs =
   ${slapos.test.kvm-setup:egg}
   ${slapos.test.matomo-setup:egg}
   ${slapos.test.metabase-setup:egg}
-  ${slapos.test.ors-amarisoft-setup:egg}
   ${slapos.test.monitor-setup:egg}
   ${slapos.test.nextcloud-setup:egg}
   ${slapos.test.nginx-push-stream-setup:egg}
+  ${slapos.test.ors-amarisoft-setup:egg}
+  ${slapos.test.plantuml-setup:egg}
   ${slapos.test.powerdns-setup:egg}
   ${slapos.test.proftpd-setup:egg}
   ${slapos.test.re6stnet-setup:egg}
@@ -352,27 +349,46 @@ context =
 
 tests =
   json-schemas ${slapos.cookbook-setup:setup}
-# The following list is for SR that work with either Python 2 and 3
-# (as main Python). The test egg must supply a URL which depends on
-# the version of Python that is used to run the test.
-# Due to a bug in the way promises are run, we may also list some Py3-only SR
-# here, to check there's no promise issue when slapos node runs with Python 2.
-  erp5 ${slapos.test.erp5-setup:setup}
-  fluentd ${slapos.test.fluentd-setup:setup}
-###
-  ${:extra}
 
-extra =
-# WARNING: This is for SR that only support Python 2.
-#          You should not add more lines here.
   backupserver ${slapos.test.backupserver-setup:setup}
   beremiz-ide ${slapos.test.beremiz-ide-setup:setup}
+  caddy-frontend ${slapos.test.caddy-frontend-setup:setup}
+  caucase ${slapos.test.caucase-setup:setup}
   cloudooo ${slapos.test.cloudooo-setup:setup}
   dream ${slapos.test.dream-setup:setup}
+  erp5 ${slapos.test.erp5-setup:setup}
+  erp5testnode ${slapos.test.erp5testnode-setup:setup}
+  fluentd ${slapos.test.fluentd-setup:setup}
+  galene ${slapos.test.galene-setup:setup}
   gitlab ${slapos.test.gitlab-setup:setup}
+  grafana ${slapos.test.grafana-setup:setup}
+  headless-chromium ${slapos.test.headless-chromium-setup:setup}
+  helloworld ${slapos.test.helloworld-setup:setup}
+  html5as ${slapos.test.html5as-setup:setup}
+  html5as-base ${slapos.test.html5as-base-setup:setup}
+  htmlvalidatorserver ${slapos.test.htmlvalidatorserver-setup:setup}
+  hugo ${slapos.test.hugo-setup:setup}
+  jscrawler ${slapos.test.jscrawler-setup:setup}
+  jstestnode ${slapos.test.jstestnode-setup:setup}
+  jupyter ${slapos.test.jupyter-setup:setup}
+  kvm ${slapos.test.kvm-setup:setup}
+  matomo ${slapos.test.matomo-setup:setup}
+  metabase ${slapos.test.metabase-setup:setup}
+  monitor ${slapos.test.monitor-setup:setup}
+  nextcloud ${slapos.test.nextcloud-setup:setup}
+  nginx-push-stream ${slapos.test.nginx-push-stream-setup:setup}
+  ors-amarisoft ${slapos.test.ors-amarisoft-setup:setup}
+  plantuml ${slapos.test.plantuml-setup:setup}
+  powerdns ${slapos.test.powerdns-setup:setup}
+  proftpd ${slapos.test.proftpd-setup:setup}
   re6stnet ${slapos.test.re6stnet-setup:setup}
+  repman ${slapos.test.repman-setup:setup}
+  restic-rest-server ${slapos.test.restic_rest_server-setup:setup}
+  seleniumserver ${slapos.test.seleniumserver-setup:setup}
   slapos-master ${slapos.test.slapos-master-setup:setup}
   slaprunner ${slapos.test.slaprunner-setup:setup}
+  theia ${slapos.test.theia-setup:setup}
+  turnserver ${slapos.test.turnserver-setup:setup}
   upgrade_erp5 ${slapos.test.upgrade_erp5-setup:setup}
 
 [versions]
@@ -397,13 +413,11 @@ PyPDF2 = 1.26.0+SlapOSPatched001
 # Django 1.11 is python 2 compatible
 Django = 1.11
 
-mock = 2.0.0:whl
 testfixtures = 6.11.0
 funcsigs = 1.0.2
 mysqlclient = 1.3.12
 pexpect = 4.8.0
 ptyprocess = 0.6.0
-typing = 3.7.4.3
 psycopg2 = 2.8.6
 
 

software/slaprunner/test/setup.py

@@ -48,7 +48,6 @@ setup(name=name,
           'supervisor',
           'psutil',
           'paramiko',
-          'six',
           'requests',
       ],
       zip_safe=True,

software/slaprunner/test/test.py

@@ -35,12 +35,11 @@ import subprocess
 import json
 import time
 
-from six.moves.urllib.parse import urlparse
-from six.moves.urllib.parse import quote
-from six.moves.urllib.parse import urljoin
-from six.moves.configparser import ConfigParser
+from urllib.parse import urlparse
+from urllib.parse import quote
+from urllib.parse import urljoin
+from configparser import ConfigParser
 import requests
-import six
 
 from slapos.recipe.librecipe import generateHashFromFiles
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
@@ -191,7 +190,7 @@ class SlaprunnerTestCase(SlapOSInstanceTestCase):
     takeover_password = parameter_dict["takeover-%s-password" % scope]
 
     resp = requests.get(
-      "%s?password=%s" % (takeover_url, takeover_password),
+      f"{takeover_url}?password={takeover_password}",
       verify=True)
     self.assertEqual(requests.codes.ok, resp.status_code)
     self.assertNotIn("Error", resp.text,
@@ -363,7 +362,7 @@ class TestSSH(SlaprunnerTestCase):
     self.assertTrue(fingerprint_from_url.startswith('ssh-rsa-'), fingerprint_from_url)
     fingerprint_from_url = fingerprint_from_url[len('ssh-rsa-'):]
 
-    class KeyPolicy(object):
+    class KeyPolicy:
       """Accept server key and keep it in self.key for inspection
       """
       def missing_host_key(self, client, hostname, key):
@@ -507,7 +506,7 @@ class TestResilientInstance(SlaprunnerTestCase):
     # just check that keys returned on requested partition are for resilient
     self.assertSetEqual(
       set(self.computer_partition.getConnectionParameterDict().keys()),
-      set([
+      {
         'backend-url',
         'feed-url-runner-1-pull',
         'feed-url-runner-1-push',
@@ -520,7 +519,7 @@ class TestResilientInstance(SlaprunnerTestCase):
         'takeover-runner-1-password',
         'takeover-runner-1-url',
         'url',
-        'webdav-url']))
+        'webdav-url'})
 
 class TestResilientCustomFrontend(TestCustomFrontend):
   instance_max_retry = 20
@@ -601,5 +600,5 @@ class TestResilientDummyInstance(SlaprunnerTestCase):
     self.assertTrue(result_after.startswith("Hello"), result_after)
 
     self.assertIn(result, result_after,
-            "%s not in %s" % (result, result_after))
+            f"{result} not in {result_after}")
 

software/theia/test/test.py

@@ -391,7 +391,9 @@ class TestTheiaEnv(TheiaTestCase):
     # Start a theia shell that inherits the environment of the theia process
     # This simulates the environment of a shell launched from the browser application
     theia_shell_process = pexpect.spawnu('{}/bin/theia-shell'.format(self.getPath()), env=theia_env)
-    try:
+    self.addCleanup(theia_shell_process.wait)
+    self.addCleanup(theia_shell_process.terminate)
+
     theia_shell_process.expect_exact('Standalone SlapOS for computer `slaprunner` activated')
 
     # Launch slapos node software from theia shell
@@ -433,11 +435,6 @@ class TestTheiaEnv(TheiaTestCase):
     self.assertEqual(theia_shell_env['SLAPOS_CLIENT_CONFIGURATION'], supervisord_env['SLAPOS_CLIENT_CONFIGURATION'])
     self.assertEqual(theia_shell_env['HOME'], supervisord_env['HOME'])
 
-    finally:
-      # Cleanup the theia shell process
-      theia_shell_process.terminate()
-      theia_shell_process.wait()
-
 
 class ResilientTheiaMixin(object):
   @classmethod