software/slapos-sr-testing: enable test for grafana

software/grafana/test/test.py

@@ -107,7 +107,7 @@ class TestInfluxDb(GrafanaTestCase):
     query_url = '{self.influxdb_url}/query'.format(**locals())
     connection_params = self.computer_partition.getConnectionParameterDict()
 
-    for i in range(5):
+    for i in range(10):
       # retry, as it may take a little delay to create databases
       resp = requests.get(
           query_url,
@@ -118,7 +118,7 @@ class TestInfluxDb(GrafanaTestCase):
               p=connection_params['influxdb-password']))
       self.assertEqual(requests.codes.ok, resp.status_code)
       result, = resp.json()['results']
-      if result['series']:
+      if result['series'] and 'values' in result['series'][0]:
         break
       time.sleep(0.5 * i)
 
@@ -179,7 +179,8 @@ class TestLoki(GrafanaTestCase):
   def test_log_ingested(self):
     # create a logger logging to the file that we have
     # configured in instance parameter.
-    test_logger = logging.getLogger(self.id())  # type: logging.Logger
+    test_logger = logging.getLogger(self.id())
+    test_logger.setLevel(logging.INFO)
     test_handler = logging.FileHandler(filename=self._logfile.name)
     test_handler.setFormatter(
         logging.Formatter(
@@ -197,13 +198,18 @@ class TestLoki(GrafanaTestCase):
           '{self.loki_url}/api/prom/query?query={{job="TestLoki"}}'.format(
               **locals()),
           verify=False).json()
-      if not resp or len(resp['streams']) < 2:
+      if not resp:
         time.sleep(0.5 * i)
         continue
 
-    warn_stream, = [stream for stream in resp['streams'] if 'level="WARNING"' in stream['labels']]
+    warn_stream_list = [stream for stream in resp['streams'] if 'level="WARNING"' in stream['labels']]
+    self.assertEqual(1, len(warn_stream_list), resp['streams'])
+    warn_stream, = warn_stream_list
     self.assertIn("testing warn", warn_stream['entries'][0]['line'])
-    info_stream, = [stream for stream in resp['streams'] if 'level="INFO"' in stream['labels']]
+
+    info_stream_list = [stream for stream in resp['streams'] if 'level="INFO"' in stream['labels']]
+    self.assertEqual(1, len(info_stream_list), resp['streams'])
+    info_stream, = info_stream_list
     self.assertTrue(
         [
             line for line in info_stream['entries']

software/slapos-sr-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 4664f7dae66d3f582e34cec2ca627501
+md5sum = 1cbab58e896ff63575f6a67db530d183

software/slapos-sr-testing/instance.cfg

@@ -28,7 +28,7 @@ bin = $${buildout:directory}/bin
 working-dir = $${buildout:directory}/tmp
 
 [test-list]
-path_list = ${slapos.cookbook-setup:setup},${slapos.test.caddy-frontend-setup:setup},${slapos.test.erp5-setup:setup},${slapos.test.slapos-master-setup:setup},${slapos.test.kvm-setup:setup},${slapos.test.monitor-setup:setup},${slapos.test.plantuml-setup:setup},${slapos.test.powerdns-setup:setup},${slapos.test.proftpd-setup:setup},${slapos.test.re6stnet-setup:setup},${slapos.test.seleniumserver-setup:setup},${slapos.test.slaprunner-setup:setup},${slapos.test.helloworld-setup:setup},${slapos.test.jupyter-setup:setup},${slapos.test.nextcloud-setup:setup},${slapos.test.turnserver-setup:setup},${slapos.test.theia-setup:setup}
+path_list = ${slapos.cookbook-setup:setup},${slapos.test.caddy-frontend-setup:setup},${slapos.test.erp5-setup:setup},${slapos.test.slapos-master-setup:setup},${slapos.test.kvm-setup:setup},${slapos.test.monitor-setup:setup},${slapos.test.plantuml-setup:setup},${slapos.test.powerdns-setup:setup},${slapos.test.proftpd-setup:setup},${slapos.test.re6stnet-setup:setup},${slapos.test.seleniumserver-setup:setup},${slapos.test.slaprunner-setup:setup},${slapos.test.helloworld-setup:setup},${slapos.test.jupyter-setup:setup},${slapos.test.nextcloud-setup:setup},${slapos.test.turnserver-setup:setup},${slapos.test.theia-setup:setup},${slapos.test.grafana-setup:setup}
 
 [slapos-test-runner]
 recipe = slapos.cookbook:wrapper

software/slapos-sr-testing/software.cfg

@@ -107,6 +107,11 @@ setup = ${slapos-repository:location}/software/turnserver/test/
 egg = slapos.test.theia
 setup = ${slapos-repository:location}/software/theia/test/
 
+[slapos.test.grafana-setup]
+<= setup-develop-egg
+egg = slapos.test.grafana
+setup = ${slapos-repository:location}/software/grafana/test/
+
 [slapos.core-repository]
 <= git-clone-repository
 repository = https://lab.nexedi.com/nexedi/slapos.core.git