squad 1.95__tar.gz → 1.96__tar.gz

{squad-1.95 → squad-1.96}/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.96
+
+This release takes in LAVA logs in Tuxsuite.
+The release also fixes a long-running query by reusing pre-calculated suite statuses.
+
 # 1.95
 
 This release collects log snippets for Tuxsuite backend.

{squad-1.95/squad.egg-info → squad-1.96}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squad
-Version: 1.95
+Version: 1.96
 Summary: Software Quality Dashboard
 Home-page: https://gitlab.com/Linaro/squad/squad
 Author: Antonio Terceiro
@@ -11,7 +11,6 @@ License-File: COPYING
 Requires-Dist: aiohttp
 Requires-Dist: celery
 Requires-Dist: cryptography
-Requires-Dist: coreapi
 Requires-Dist: django_crispy_forms==1.14.0
 Requires-Dist: Django<5,>=3
 Requires-Dist: django-allauth

{squad-1.95 → squad-1.96}/doc/api.rst

@@ -419,7 +419,7 @@ built and it's available at /api/schema URL. Example usage with coreapi-cli:
 More details about coreapi can be found on coreapi website and DRF website:
 
  * http://www.coreapi.org/
- * https://www.django-rest-framework.org/topics/api-clients/
+ * https://www.django-rest-framework.org/community/mozilla-grant/#client-libraries
 
 SQUAD-Client
 -------------------------

{squad-1.95 → squad-1.96}/requirements-dev.txt

@@ -9,4 +9,3 @@ pytest
 pytest-django
 pytest-cov
 requests-mock
-squad-linaro-plugins

{squad-1.95 → squad-1.96}/requirements.txt

@@ -1,7 +1,6 @@
 aiohttp
 celery
 cryptography
-coreapi
 django_crispy_forms==1.14.0
 Django<5,>=3
 django-allauth

{squad-1.95 → squad-1.96}/squad/ci/backend/tuxsuite.py

@@ -414,9 +414,6 @@ class Backend(BaseBackend):
         tests_results = self.fetch_url(job_url + '/', 'results').json()
         if tests_results.get('error', None) is None:
             for suite, suite_tests in tests_results.items():
-                if suite == 'lava':
-                    continue
-
                 suite_name = re.sub(r'^[0-9]+_', '', suite)
                 for name, test_data in suite_tests.items():
                     test_name = f'{suite_name}/{name}'

{squad-1.95 → squad-1.96}/squad/core/models.py

@@ -1,7 +1,7 @@
 import json
 import yaml
 import logging
-from collections import OrderedDict, Counter
+from collections import Counter, defaultdict
 from hashlib import sha1
 from itertools import groupby
 import re
@@ -676,36 +676,62 @@ class Build(models.Model):
 
     @property
     def test_suites_by_environment(self):
-        test_runs = self.test_runs.prefetch_related(
-            'tests',
-            'tests__suite',
-            'environment',
+        """
+        Return a sorted dictionary like
+        {
+            "env1": [
+                ("suite1", {"fail": 0, "pass": 0, "skip": 0, "xfail": 0}),
+                ("suite2", {"fail": 0, "pass": 0, "skip": 0, "xfail": 0}),
+                ...
+            ],
+            "env2": [
+                ("suite1", {"fail": 0, "pass": 0, "skip": 0, "xfail": 0}),
+                ("suite2", {"fail": 0, "pass": 0, "skip": 0, "xfail": 0}),
+                ...
+            ],
+            ...
+        }
+
+        Sorted by env slug, and then by suite slug
+        """
+
+        tmp_results = defaultdict(
+            lambda: defaultdict(
+                lambda: {
+                    "fail": 0,
+                    "pass": 0,
+                    "skip": 0,
+                    "xfail": 0,
+                }
+            )
         )
-        template = OrderedDict((
-            ('fail', 0),
-            ('pass', 0),
-            ('skip', 0),
-            ('xfail', 0),
-        ))
-        result = OrderedDict()
-        envlist = set([t.environment for t in test_runs])
-        for env in sorted(envlist, key=lambda env: env.slug):
-            result[env] = dict()
-        for tr in test_runs:
-            for t in tr.tests.all():
-                if t.suite in result[tr.environment].keys():
-                    result[tr.environment][t.suite][t.status] += 1
-                else:
-                    if t.suite not in result[tr.environment]:
-                        result[tr.environment][t.suite] = template.copy()
-                    result[tr.environment][t.suite][t.status] += 1
-        for env in result.keys():
-            # there should only be one key in the most nested dict
-            result[env] = sorted(
-                result[env].items(),
-                key=lambda suite_dict: suite_dict[0].slug)
-
-        return result
+
+        statuses = Status.objects.filter(
+            test_run__build=self,
+            suite__isnull=False
+        ).prefetch_related(
+            'test_run__environment',
+            'suite',
+        ).order_by(
+            'test_run__environment__slug',
+            'suite__slug',
+        )
+
+        for status in statuses:
+            env = status.test_run.environment
+            suite = status.suite
+
+            tmp_results[env][suite]['fail'] += status.tests_fail
+            tmp_results[env][suite]['pass'] += status.tests_pass
+            tmp_results[env][suite]['skip'] += status.tests_skip
+            tmp_results[env][suite]['xfail'] += status.tests_xfail
+
+        results = defaultdict(list)
+        for env, suites in tmp_results.items():
+            for suite, status in suites.items():
+                results[env].append((suite, status))
+
+        return results
 
     def test_jobs_summary(self, per_environment=False):
         testjobs = self.test_jobs.only('environment', 'job_status', 'target_build').order_by('environment')

{squad-1.95 → squad-1.96}/squad/jinja2.py

@@ -69,7 +69,7 @@ def _register(attr, fn=None, name=None, takes_context=None):
 
 
 def _update_local_env(attr, func, name=None, takes_context=None):
-    global _local_env
+    global _local_env  # noqa
 
     if takes_context:
         func.contextfunction = True

squad-1.96/squad/version.py

@@ -0,0 +1 @@
+__version__ = '1.96'

{squad-1.95 → squad-1.96/squad.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squad
-Version: 1.95
+Version: 1.96
 Summary: Software Quality Dashboard
 Home-page: https://gitlab.com/Linaro/squad/squad
 Author: Antonio Terceiro
@@ -11,7 +11,6 @@ License-File: COPYING
 Requires-Dist: aiohttp
 Requires-Dist: celery
 Requires-Dist: cryptography
-Requires-Dist: coreapi
 Requires-Dist: django_crispy_forms==1.14.0
 Requires-Dist: Django<5,>=3
 Requires-Dist: django-allauth

{squad-1.95 → squad-1.96}/squad.egg-info/SOURCES.txt

@@ -612,8 +612,6 @@ test/frontend/test_tests.py
 test/frontend/test_utils.py
 test/integration/__init__.py
 test/integration/test_build_notification_from_ci.py
-test/integration/plugins/test_tradefed.py
-test/integration/plugins/tradefed-output-20220608105250.tar.xz
 test/plugins/__init__.py
 test/plugins/test_gerrit.py
 test/plugins/test_github.py

{squad-1.95 → squad-1.96}/squad.egg-info/requires.txt

@@ -1,7 +1,6 @@
 aiohttp
 celery
 cryptography
-coreapi
 django_crispy_forms==1.14.0
 Django<5,>=3
 django-allauth

{squad-1.95 → squad-1.96}/test/ci/backend/test_tuxsuite.py

@@ -979,7 +979,7 @@ class TuxSuiteTest(TestCase):
             fake_request.get(urljoin(test_url + '/', 'tux_plan.yaml'), text='tux_plan.yaml contents')
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
-            tests_results = {k: v["result"] for k, v in tests.items()}
+            tests_results = {k: v["result"] for k, v in tests.items() if not k.startswith("lava/")}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
@@ -1082,7 +1082,7 @@ class TuxSuiteTest(TestCase):
             fake_request.get(urljoin(test_url + '/', 'tux_plan.yaml'), text='tux_plan.yaml contents')
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
-            tests_results = {k: v["result"] for k, v in tests.items()}
+            tests_results = {k: v["result"] for k, v in tests.items() if not k.startswith("lava/")}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
@@ -1168,7 +1168,7 @@ class TuxSuiteTest(TestCase):
             fake_request.get(urljoin(test_url + '/', 'tux_plan.yaml'), text='tux_plan.yaml contents')
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
-            tests_results = {k: v["result"] for k, v in tests.items()}
+            tests_results = {k: v["result"] for k, v in tests.items() if not k.startswith("lava/")}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
@@ -1268,7 +1268,7 @@ class TuxSuiteTest(TestCase):
             fake_request.get(test_url, json=job_data)
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
-            tests_results = {k: v["result"] for k, v in tests.items()}
+            tests_results = {k: v["result"] for k, v in tests.items() if not k.startswith("lava/")}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
@@ -1370,7 +1370,7 @@ class TuxSuiteTest(TestCase):
             fake_request.get(urljoin(test_url + '/', 'tux_plan.yaml'), text='tux_plan.yaml contents')
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
-            tests_results = {k: v["result"] for k, v in tests.items()}
+            tests_results = {k: v["result"] for k, v in tests.items() if not k.startswith("lava/")}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
@@ -1651,7 +1651,7 @@ class TuxSuiteTest(TestCase):
             fake_request.get(urljoin(test_url + '/', 'tux_plan.yaml'), text='tux_plan.yaml contents')
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
-            tests_results = {k: v["result"] for k, v in tests.items()}
+            tests_results = {k: v["result"] for k, v in tests.items() if not k.startswith("lava/")}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))

{squad-1.95 → squad-1.96}/test/core/test_build.py

@@ -3,8 +3,8 @@ from django.test import TestCase
 from django.utils import timezone
 from unittest.mock import patch
 
-
 from squad.core.models import Group, Project, Build, KnownIssue, SuiteMetadata
+from squad.core.tasks import RecordTestRunStatus
 from squad.ci.models import TestJob, Backend
 
 
@@ -227,7 +227,10 @@ class BuildTest(TestCase):
         testrun1.tests.create(build=testrun1.build, environment=testrun1.environment, suite=foo, metadata=foo_test1_metadata, result=True)
         testrun1.tests.create(build=testrun1.build, environment=testrun1.environment, suite=foo, metadata=foo_pla_metadata, result=True)
         testrun1.tests.create(build=testrun1.build, environment=testrun1.environment, suite=bar, metadata=bar_test1_metadata, result=False)
+        RecordTestRunStatus()(testrun1)
+
         testrun2.tests.create(build=testrun2.build, environment=testrun2.environment, suite=foo, metadata=foo_test1_metadata, result=True)
+        RecordTestRunStatus()(testrun2)
 
         # make sure 'xfail' is covered by test
         issue = KnownIssue.objects.create(title='pla is broken', test_name='qux')

squad-1.95/squad/version.py

@@ -1 +0,0 @@
-__version__ = '1.95'

squad-1.95/test/integration/plugins/test_tradefed.py

@@ -1,161 +0,0 @@
-from django.test import TestCase
-import requests_mock
-
-
-from squad.core.models import Group, Status
-from squad.ci.models import Backend
-
-from squad.core.plugins import get_plugin_instance
-
-"""
-    This tests SQUAD's compatibility with the Tradefed plugin that might
-    be enabled in projects.
-
-    In order to be closer to a real execution of tradefed, there's a sample
-    of a tradefed tar ball adjusted from one of the jobs in LAVA. The only difference
-    is in size. The actual file is over 100MB, and since we're keeping it
-    in the repository, it wouldn't be convenient to store that. The file
-    was striped in a file of 0.5MB.
-
-    The most important file is `test_results.xml`, which contains a list of all
-    passing an failing tests, along with logs. The one located in the tar ball has
-    the following pattern:
-
-    <?xml version='1.0' encoding='UTF-8' standalone='no' ?>
-    <?xml-stylesheet type="text/xsl" href="compatibility_result.xsl"?>
-    <Result ...>
-        <Build ...>
-            <Summary pass="972406" failed="5" modules_done="1" modules_total="1" />
-            <Module name="CtsDeqpTestCases" abi="arm64-v8a" runtime="4310214" done="true" pass="972406" total_tests="972411">
-                <TestCase name="dEQP-EGL.info">
-                    <Test result="pass" name="version" />
-                    <Test result="pass" name="vendor" />
-                    <Test result="pass" name="client_apis" />
-                    <Test result="pass" name="extensions" />
-                    <Test result="pass" name="configs" />
-                </TestCase>
-            </Module>
-        </Build>
-    </Result>
-
-    There are
-    * 1 Module tag
-    * 285 TestCase tags
-    * 6273 Test tags
-      * 6272 passes
-      * 1 fail
-"""
-
-
-definition = """
-actions:
-- test:
-    docker:
-      image: yongqinliu/linaro-android-docker:0.1
-    timeout:
-      minutes: 5
-    definitions:
-    - from: inline
-      path: format-metatdata.yaml
-      name: format-metatdata
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: format-metatdata
-          description: format-metatdata
-        run:
-          steps:
-          - lava-test-case "format-metadata" --shell fastboot format:ext4 metadata
-- test:
-    docker:
-      image: yongqinliu/linaro-android-docker:0.1
-    timeout:
-      minutes: 900
-    definitions:
-    - repository: https://github.com/Linaro/test-definitions.git
-      from: git
-      path: automated/android/noninteractive-tradefed/tradefed.yaml
-      params:
-        TEST_PARAMS: cts-presubmit --abi arm64-v8a -m CtsDeqpTestCases --disable-reboot
-        TEST_URL: http://testdata.linaro.org/lkft/aosp-stable/android/lkft/lkft-aosp-android12-cts/332/android-cts.zip
-        TEST_PATH: android-cts
-        RESULTS_FORMAT: aggregated
-        ANDROID_VERSION: aosp-android12
-      name: cts-lkft
-"""
-
-job_suites = {
-    'count': 1,
-    'next': None,
-    'previous': None,
-    'results': [
-        {
-            'id': 1,
-            'resource_uri': 'http://lava.server/api/v0.2/jobs/5149627/suites/12261981/',
-            'name': '3_cts-lkft',
-            'job': 5149627
-        },
-    ],
-}
-
-suite_attachments = {
-    'count': 1,
-    'next': None,
-    'previous': None,
-    'results': [
-        {
-            'id': 789133853,
-            'result': 'pass',
-            'resource_uri': 'http://lava.server/api/v0.2/jobs/5149627/suites/12261981/tests/789133853/',
-            'unit': '',
-            'name': 'test-attachment',
-            'measurement': None,
-            'metadata': "{case: test-attachment, definition: 3_cts-lkft, reference: 'http://attachment.server/artifacts/team/qa/2022/06/08/10/55/tradefed-output-20220608105250.tar.xz',\n  result: pass}\n",
-            'start_log_line': None,
-            'end_log_line': None,
-            'logged': '2022-06-08T10:55:14.655858Z',
-            'suite': 12261981,
-            'test_set': None
-        }
-    ]
-}
-
-with open('test/integration/plugins/tradefed-output-20220608105250.tar.xz', 'rb') as f:
-    tar_contents = f.read()
-
-
-class TestTradefed(TestCase):
-
-    def setUp(self):
-        self.group = Group.objects.create(slug="mygroup")
-        self.project = self.group.projects.create(slug="myproject", project_settings="PLUGINS_TRADEFED_EXTRACT_AGGREGATED: True")
-        self.build = self.project.builds.create(version="tradefed-build")
-        self.env = self.project.environments.create(slug="myenv")
-        self.testrun = self.build.test_runs.create(environment=self.env)
-        self.backend = Backend.objects.create(url="http://lava.server/api/v0.2/", name="tradefed-backend", implementation_type="lava")
-        self.testjob = self.build.test_jobs.create(definition=definition, target=self.project, backend=self.backend, job_id="123", testrun=self.testrun)
-        self.tradefed = get_plugin_instance('tradefed')
-
-    def test_parse_cts_results(self):
-
-        with requests_mock.Mocker() as m:
-            m.get('http://lava.server/api/v0.2/jobs/123/suites/', json=job_suites)
-            m.get('http://lava.server/api/v0.2/jobs/123/suites/1/tests/', json=suite_attachments)
-            m.get('http://attachment.server/artifacts/team/qa/2022/06/08/10/55/tradefed-output-20220608105250.tar.xz', content=tar_contents)
-            self.tradefed.postprocess_testjob(self.testjob)
-
-        self.testrun.refresh_from_db()
-
-        # Check that the status has been recorded
-        self.assertTrue(self.testrun.status_recorded)
-        status = Status.objects.get(test_run=self.testrun, suite=None)
-        self.assertEqual(6272, status.tests_pass)
-        self.assertEqual(1, status.tests_fail)
-
-        # Check that the failed test contain the proper log
-        failed_test = self.testrun.tests.filter(result=False).first()
-        expected_log = 'with config {glformat=rgba8888d24s8ms0,rotation=unspecified,surfacetype=window,required=true}'
-        self.assertIn(expected_log, failed_test.log)
-
-        # Check that the attachment was saved to the testrun
-        self.assertTrue(self.testrun.attachments.count() > 0)