Merge branch 'master' into x/lte-multiru

* master:
  software/erp5/upgrade_test: use 1.0.167.10 for old software
  software/nextcloud/test: adjust test
  software/jstestnode: use default firefox version
  software/cloudooo/test: snapshot test an odg to png conversion

software/cloudooo/test/test.py

@@ -37,9 +37,12 @@ import base64
 import io
 
 import requests
+import PIL.Image
 import PyPDF2
 
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
+from slapos.testing.utils import ImageComparisonTestCase
+
 
 setUpModule, _CloudOooTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
@@ -246,6 +249,27 @@ class TestLibreoffice(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase):
         ).encode())
 
 
+class TestLibreofficeDrawToPNGConversion(CloudOooTestCase, ImageComparisonTestCase):
+  __partition_reference__ = 'l'
+
+  def test(self):
+    reference_png = PIL.Image.open(os.path.join('data', f'{self.id()}.png'))
+    with open(os.path.join('data', f'{self.id()}.odg'), 'rb') as f:
+      actual_png_data = base64.decodebytes(
+        self.server.convertFile(
+          base64.encodebytes(f.read()).decode(),
+          'odg',
+          'png',
+        ).encode())
+      actual_png = PIL.Image.open(io.BytesIO(actual_png_data))
+
+    # save a snapshot
+    with open(os.path.join(self.computer_partition_root_path, self.id() + '.png'), 'wb') as f:
+      f.write(actual_png_data)
+
+    self.assertImagesSame(actual_png, reference_png)
+
+
 class TestLibreOfficeTextConversion(CloudOooTestCase):
   __partition_reference__ = 'txt'
 

software/erp5/upgrade_test/test.py

@@ -46,7 +46,7 @@ from slapos.testing.testcase import (
   makeModuleSetUpAndTestCaseClass,
 )
 
-old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.9/software/erp5/software.cfg'
+old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.10/software/erp5/software.cfg'
 new_software_release_url = os.path.abspath(
   os.path.join(os.path.dirname(__file__), '..', 'software.cfg'))
 

software/jstestnode/buildout.hash.cfg

@@ -27,4 +27,4 @@ md5sum = 98faa5ad8cfb23a11d97a459078a1d05
 
 [template-runTestSuite]
 filename = runTestSuite.in
-md5sum = 2bb3d71a0e04bc8bc828bb3f726ef3ff
+md5sum = 5db53d622bd68fb07e078ddc4403a240

software/jstestnode/runTestSuite.in

@@ -93,7 +93,7 @@ def main():
         firefox_capabilities['marionette'] = True
         browser = webdriver.Firefox(
             capabilities=firefox_capabilities,
-            firefox_binary='${firefox-wrapper-68:location}',
+            firefox_binary='${firefox-wrapper:location}',
             executable_path='${geckodriver:location}')
       else:
         assert target == 'selenium-server', f"Unsupported target {test_runner['target']}"

software/jstestnode/software.cfg

@@ -22,7 +22,7 @@ parts =
   git
   eggs
   xserver
-  firefox-68
+  firefox
   xwd
   renderjs-install
   jio-install

software/nextcloud/test/test.py

@@ -92,7 +92,7 @@ class NextCloudTestCase(InstanceTestCase):
       mail_smtpname="",
       cli_url="https://[%s]:9988/" % self.nextcloud_ipv6,
       partition_dir=self.partition_dir,
-      trusted_domain_list=json.dumps(["[%s]:9988" % self.nextcloud_ipv6]),
+      trusted_domain_list=json.dumps(["[%s]:9988" % self.nextcloud_ipv6] * 2),
       trusted_proxy_list=[],
     )
     data_dict.update(config_dict)
@@ -309,8 +309,7 @@ class TestNextCloudParameters(NextCloudTestCase):
       'instance.turn-server': 'turn.example.net:5439',
       'instance.turn-secret': 'c4f0ead40a49bbbac3c58f7b9b43990f78ebd96900757ae67e10190a3a6b6053',
       'instance.cli-url': 'nextcloud.example.com',
-      'instance.trusted-domain-1': 'nextcloud.example.com',
-      'instance.trusted-domain-2': 'nextcloud.proxy.com',
+      'instance.trusted-domain-list': 'nextcloud.example.com nextcloud.proxy.com',
       'instance.trusted-proxy-list': '2001:67c:1254:e:89::5df3 127.0.0.1 10.23.1.3',
     }
 
@@ -345,6 +344,7 @@ class TestNextCloudParameters(NextCloudTestCase):
       cli_url="nextcloud.example.com",
       partition_dir=self.partition_dir,
       trusted_domain_list=json.dumps([
+        "[%s]:9988" % self.nextcloud_ipv6,
         "[%s]:9988" % self.nextcloud_ipv6,
         "nextcloud.example.com",
         "nextcloud.proxy.com"