wip

software/erp5/test/test/__init__.py

@@ -29,6 +29,8 @@ from __future__ import absolute_import
 import json
 import os
 
+import urllib3
+
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 
@@ -39,6 +41,9 @@ _setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
 
 setup_module_executed = False
 def setUpModule():
+  # these tests are all using 
+  urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
   # slapos.testing.testcase's only need to be executed once
   global setup_module_executed
   if not setup_module_executed:

software/erp5testnode/software.cfg

@@ -12,6 +12,7 @@ extends =
   ../../component/pwgen/buildout.cfg
   ../../component/apache/buildout.cfg
   ../../stack/monitor/buildout.cfg
+  ../../component/defaults.cfg
 
 parts =
   slapos-command
@@ -22,6 +23,9 @@ parts =
   git
   apache
 
+[python]
+part = python3
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -58,3 +62,8 @@ zope.cachedescriptors = 4.3.1
 zope.event = 4.4
 zope.schema = 4.9.3
 slapos.tool.nosqltester = 0.0.4.dev-r45972
+
+[versions:python3]
+z3c.etestbrowser = 3.0.1
+zope.deferredimport = 4.3.1
+zope.proxy = 4.4.0

software/grafana/test/test.py

@@ -82,7 +82,7 @@ class TestGrafana(GrafanaTestCase):
     self.assertEqual(requests.codes.ok, resp.status_code)
     self.assertEqual(1, resp.json()['id'])
 
-  def test_grafana_datasource_povisinonned(self):
+  def test_grafana_datasource_provisioned(self):
     # data sources are provisionned
     connection_params = self.computer_partition.getConnectionParameterDict()
     resp = requests.get(

software/slapos-testing/software.cfg

@@ -29,6 +29,14 @@ parts =
   eggs/scripts
   phantomjs
   template
+  shellcheck
+
+[shellcheck:linux and platform.machine() == 'x86_64']
+recipe = slapos.recipe.build:download-unpacked
+url = https://github.com/koalaman/shellcheck/releases/download/v0.8.0/shellcheck-v0.8.0.linux.aarch64.tar.xz
+md5sum = a0338c733d1283a51777b27edf9ccc96
+environment =
+  PATH=${xz-utils:location}/bin/  :%(PATH)s
 
 [bootstrap-slapos.recipe.cmmi]
 # install our develop version of slapos.recipe.cmmi before anything else,