html5-base: Add basic test suite

software/html5as-base/test/README.md

+Tests for html5as-base software release

software/html5as-base/test/setup.py

+##############################################################################
+#
+# Copyright (c) 2019 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from setuptools import setup, find_packages
+
+version = '0.0.1.dev0'
+name = 'slapos.test.html5asbase'
+with open("README.md") as f:
+  long_description = f.read()
+
+setup(
+    name=name,
+    version=version,
+    description="Test for SlapOS' HTML5AS Base",
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    maintainer="Nexedi",
+    maintainer_email="info@nexedi.com",
+    url="https://lab.nexedi.com/nexedi/slapos",
+    packages=find_packages(),
+    install_requires=[
+        'slapos.core',
+        'slapos.libnetworkcache',
+        'erp5.util',
+        'requests',
+    ],
+    zip_safe=True,
+    test_suite='test',
+)

software/html5as-base/test/test.py

+##############################################################################
+#
+# Copyright (c) 2021 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+import requests
+
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
+
+setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
+
+
+class HTML5ASBaseTestCase(SlapOSInstanceTestCase):
+  """
+  Common class for testing html5as base.
+  It inherit from SlapOSInstanceTestCase which:
+    * Install the software release.
+    * Checks it compile without issue.
+    * Deploy the instance
+    * Check deployement works and promise pass
+  For testing the deployement a different testing class will need to be set up
+  per each variation of parameters the instance needs to be given.
+  """
+
+  def checkUrlAndGetResponse(self, url):
+    """
+    Common class to check an url and return the response
+    """
+    response = requests.get(url)
+    self.assertEqual(requests.codes['OK'], response.status_code)
+    return response
+
+
+class TestEmptyDeploy(HTML5ASBaseTestCase):
+  """
+  This class test the instance with no parameters.
+  """
+
+  def test_deploy_with_no_paramater(self):
+    """
+    Get the connection URL and check it is accessible
+    """
+    url = self.requestDefaultInstance().getConnectionParameterDict()['server_url']
+    response = self.checkUrlAndGetResponse(url)
+    result = response.text
+    self.assertEqual("Hello World!\n", result)
\ No newline at end of file

software/slapos-sr-testing/software.cfg

@@ -124,6 +124,11 @@ setup = ${slapos-repository:location}/software/helloworld/test/
 egg = slapos.test.html5as
 setup = ${slapos-repository:location}/software/html5as/test/
 
+[slapos.test.html5as-base-setup]
+<= setup-develop-egg
+egg = slapos.test.html5asbase
+setup = ${slapos-repository:location}/software/html5as-base/test/
+
 [slapos.test.jupyter-setup]
 <= setup-develop-egg
 egg = slapos.test.jupyter
@@ -230,6 +235,7 @@ extra-eggs =
   ${slapos.test.caucase-setup:egg}
   ${slapos.test.jscrawler-setup:egg}
   ${slapos.test.html5as-setup:egg}
+  ${slapos.test.html5as-base-setup:egg}
 
 # We don't name this interpreter `python`, so that when we run slapos node
 # software, installation scripts running `python` use a python without any
@@ -302,6 +308,7 @@ extra =
   caucase ${slapos.test.caucase-setup:setup}
   jscrawler ${slapos.test.jscrawler-setup:setup}
   html5as ${slapos.test.html5as-setup:setup}
+  html5as-base ${slapos.test.html5as-base-setup:setup}
 
 [versions]
 # slapos.core is used from the clone always

[Julien Muchembled]

On 048eaa1c, I already complained about the fact that there's likely no reason for html5as not to Py3-only.

Please take the time to try both html5as/html5as-base with Python 3:

• if there are issues you can't easily fix, notify me or anyone else who is more involved in Python 3;
• else make it Py3-only and move the 2 tests to software/slapos-sr-testing/software-py3.cfg, as being documented in !968 (merged).