squad 1.95__py3-none-any.whl → 1.96.1__py3-none-any.whl

squad/ci/backend/tuxsuite.py

@@ -392,9 +392,12 @@ class Backend(BaseBackend):
         if 'unknown' == results['results']['boot']:
             return None
 
-        # Retrieve TuxRun log
+        # Retrieve plain text log
         logs = self.fetch_url(job_url + '/', 'logs?format=txt').text
-        log_lines = logs.splitlines()
+
+        # Retrieve YAML log
+        log_structured = self.fetch_url(results["download_url"], 'lava-logs.yaml').text
+        log_data = yaml.safe_load(log_structured)
 
         attachment_list = ["reproducer", "tux_plan.yaml"]
         attachments = {}
@@ -410,26 +413,44 @@ class Backend(BaseBackend):
         boot_test_name = 'boot/' + (metadata.get('build_name') or 'boot')
         tests[boot_test_name] = {'result': results['results']['boot']}
 
+        lava_signal = re.compile("^<LAVA_SIGNAL_")
+
+        def filter_log(line):
+            return type(line["msg"]) is str \
+                and line["lvl"] == "target" \
+                and not lava_signal.match(line["msg"])
+
         # Really fetch test results
         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}'
-                    result = test_data['result']
+                    result = test_data.get('result')
+                    if not result:
+                        continue
                     if "starttc" in test_data:
-                        starttc = test_data["starttc"] - 1  # LAVA data counts from 1, we count from 0
+                        try:
+                            # LAVA data counts from 1, we count from 0
+                            starttc = int(test_data["starttc"]) - 1
+                        except ValueError:
+                            continue
                         if "endtc" in test_data:
-                            # no -1 as the second index of the slice needs to be
-                            # greater than the first to get at least one item.
-                            endtc = test_data["endtc"]
+                            try:
+                                # no -1 as the second index of the slice needs to be
+                                # greater than the first to get at least one item.
+                                endtc = int(test_data["endtc"])
+                            except ValueError:
+                                endtc = starttc + 2
                         else:
                             endtc = starttc + 2
-                        log_snippet = "\n".join(log_lines[starttc:endtc])
+                        log_lines = [
+                            line["msg"].replace("\x00", "")
+                            for line in log_data[starttc:endtc]
+                            if filter_log(line)
+                        ]
+                        log_snippet = "\n".join(log_lines)
                     else:
                         log_snippet = None
                     tests[test_name] = {"result": result, "log": log_snippet}

squad/ci/management/commands/testfetch.py

@@ -31,17 +31,24 @@ class Command(BaseCommand):
             type=str,
             help='Project to fetch the data into (Format: foo/bar)',
         )
+        parser.add_argument(
+            'BUILD',
+            type=str,
+            nargs="?",
+            help='Build to fetch the data into',
+        )
 
     def handle(self, *args, **options):
         backend_name = options.get("BACKEND")
         job_id = options.get("JOBID")
         group_slug, project_slug = options.get("PROJECT").split('/')
+        _build = options.get("BUILD") or str(time.time())
 
         backend = Backend.objects.get(name=backend_name)
 
         group, _ = Group.objects.get_or_create(slug=group_slug)
         project, _ = group.projects.get_or_create(slug=project_slug)
-        build = project.builds.create(version=str(time.time()))
+        build, _ = project.builds.get_or_create(version=_build)
 
         testjob = backend.test_jobs.create(target=project, job_id=job_id, target_build=build)
 

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/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/version.py

@@ -1 +1 @@
-__version__ = '1.95'
+__version__ = '1.96.1'

{squad-1.95.dist-info → squad-1.96.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squad
-Version: 1.95
+Version: 1.96.1
 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.dist-info → squad-1.96.1.dist-info}/RECORD

@@ -4,13 +4,13 @@ squad/celery.py,sha256=JyflXsOPFcQ0ltX9f4DtPi-zcBV9Hmi74SdPur3dkdY,1919
 squad/compat.py,sha256=VhgZ8fwMu-FT7vZMOqEuLussVTTzPm68uIL37UHmSmk,1409
 squad/container_settings.py,sha256=bac_j_ibZY5hEaasRhNyliq9sfsP6ks4RzGIyHskXW4,1209
 squad/http.py,sha256=KuIKtpf3yOvf5fwc0T2MR0ul1l4AKxq3b0CLdk6KBhM,3667
-squad/jinja2.py,sha256=OKX-lzNz6qtTZL56HWv4UBMPuBl4WQXv0qFJztGp9zs,2541
+squad/jinja2.py,sha256=Uv33jwWKhru5Z3vGVl5hxjyRZNHSdy9kMb8tyjFqzTU,2549
 squad/mail.py,sha256=xH5wuIpD7u1fTN9vNOcbzByojleaffsKwp-9i3BeOD0,390
 squad/manage.py,sha256=Z-LXT67p0R-IzwJ9fLIAacEZmU0VUjqDOSg7j2ZSxJ4,1437
 squad/settings.py,sha256=sLSts3qmUgXmpLmzhOBrTmFcSuBRMugo0hDY0uw4z3A,14792
 squad/socialaccount.py,sha256=vySqPwQ3qVVpahuJ-Snln8K--yzRL3bw4Nx27AsB39A,789
 squad/urls.py,sha256=JiEfVW8YlzLPE52c2aHzdn5kVVKK4o22w8h5KOA6QhQ,2776
-squad/version.py,sha256=cHY8wiHdCU8oCYKc385f_9EJul17Xe2A_Ho0BrCtExQ,21
+squad/version.py,sha256=EM3neo5Jmib77mEZj8psBMuUtUBD4DJ7qRXROfPOFBw,23
 squad/wsgi.py,sha256=SF8T0cQ0OPVyuYjO5YXBIQzvSXQHV0M2BTmd4gP1rPs,387
 squad/api/__init__.py,sha256=CJiVakfAlHVN5mIFRVQYZQfuNUhUgWVbsdYTME4tq7U,1349
 squad/api/apps.py,sha256=Trk72p-iV1uGn0o5mdJn5HARUoHGbfgO49jwXvpkmdQ,141
@@ -33,12 +33,12 @@ squad/ci/backend/__init__.py,sha256=yhpotXT9F4IdAOXvGQ3-17eOHAFwoaqf9SnMX17ab30,
 squad/ci/backend/fake.py,sha256=MTsxGZuihJOd39X8ysJhiYp4A0R46lyhdkjoTgFm6a8,2435
 squad/ci/backend/lava.py,sha256=Atb2AgV5OSejtN1LyE7xONTFvJCdDoh9vK9RO_P7L2g,34077
 squad/ci/backend/null.py,sha256=oZx3OofUKSuLOYS_GZkteGaD6JOEEkdknVmi4_cxDOQ,5645
-squad/ci/backend/tuxsuite.py,sha256=FHZMR73CbY2ocKGcsYy66FLN3zafIYVVFq5QgSZGg1Q,20010
+squad/ci/backend/tuxsuite.py,sha256=roWaCHDenmyD0094jgTXhxXyZDtafNVQ9IXStcBxenc,20894
 squad/ci/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 squad/ci/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 squad/ci/management/commands/create_tuxsuite_boot_tests.py,sha256=JvjNusebLX71eyz9d-kaeCyekYSpzc1eXoeIqWK9ygo,4045
 squad/ci/management/commands/listen.py,sha256=3o0IZPeUz3D3Pd-yL-yJdYkRmSgm6mhzB8qUCt6oejU,4683
-squad/ci/management/commands/testfetch.py,sha256=28vOmmpgZFhJZRmXOCZxSN0y64fpLDCrmM7oi5rewk4,1663
+squad/ci/management/commands/testfetch.py,sha256=pPFO74X5KCJMGr3OYt9bqijDQd_MAHRmc-bS3imMzwM,1875
 squad/ci/migrations/0001_initial.py,sha256=oIcEE32zdiuQkCyyily6VKnRVH8e03cYmvcxlo0iELg,2098
 squad/ci/migrations/0002_auto_20170406_1252.py,sha256=rLGNiNaV737vCVKtEOWTzdH4vkVlBdwfhYkkRdD7xps,633
 squad/ci/migrations/0003_backend_name.py,sha256=8erX-jJFSA-l9eefrWt4_sE7Qb3pVPDNjJJSqg_Mofk,512
@@ -82,7 +82,7 @@ squad/core/comparison.py,sha256=LR3-Unv0CTmakFCDzF_h8fm2peTJzkv79mQWNau1iwI,2442
 squad/core/data.py,sha256=2zw56v7iYRTUc7wlhuUNgwIIMmK2w84hi-amR9J7EPU,2236
 squad/core/failures.py,sha256=X6lJVghM2fOrd-RfuHeLlezW2pt7owDZ8eX-Kn_Qrt0,918
 squad/core/history.py,sha256=QRSIoDOw6R6vUWMtsPMknsHGM7FaCAeuCYqASCayHTk,3541
-squad/core/models.py,sha256=qSLlxjBwzsZKGoCkPX6T-g48jXg81B1JH3wMXSLLvHQ,61401
+squad/core/models.py,sha256=I0j8jWte1WZDoAbAwLQKVNpssfhcN4AJuWDN2409kVo,61969
 squad/core/notification.py,sha256=rOpO6F63w7_5l9gQgWBBEk-MFBjp7x_hVzoVIVyDze0,10030
 squad/core/plugins.py,sha256=FLgyoXXKnPBYEf2MgHup9M017rHuADHivLhgzmx_cJE,6354
 squad/core/queries.py,sha256=78fhIJZWXIlDryewYAt96beK1VJad66Ufu8cg3dHh4w,7698
@@ -436,9 +436,9 @@ squad/run/__main__.py,sha256=DOl8JOi4Yg7DdtwnUeGqtYBJ6P2k-D2psAEuYOjWr8w,66
 squad/run/listener.py,sha256=jBeOQhPGb4EdIREB1QsCzYuumsfJ-TqJPd3nR-0m59g,200
 squad/run/scheduler.py,sha256=CDJG3q5C0GuQuxwlMOfWTSSJpDdwbR6rzpbJfuA0xuw,277
 squad/run/worker.py,sha256=jtML0h5qKDuSbpJ6_rpWP4MT_rsGA7a24AhwGxBquzk,594
-squad-1.95.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-squad-1.95.dist-info/METADATA,sha256=Hy1EwoLVmQ9HXWXDXQeSv1yJdHMgD6M1VgEaEzBeVsM,1536
-squad-1.95.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-squad-1.95.dist-info/entry_points.txt,sha256=apCDQydHZtvqV334ql6NhTJUAJeZRdtAm0TVcbbAi5Q,194
-squad-1.95.dist-info/top_level.txt,sha256=_x9uqE1XppiiytmVTl_qNgpnXus6Gsef69HqfliE7WI,6
-squad-1.95.dist-info/RECORD,,
+squad-1.96.1.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+squad-1.96.1.dist-info/METADATA,sha256=3yQ4R0HGTu3BvUf7uJnt94G-qX-h58tcKzBH0PvHW9U,1515
+squad-1.96.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+squad-1.96.1.dist-info/entry_points.txt,sha256=apCDQydHZtvqV334ql6NhTJUAJeZRdtAm0TVcbbAi5Q,194
+squad-1.96.1.dist-info/top_level.txt,sha256=_x9uqE1XppiiytmVTl_qNgpnXus6Gsef69HqfliE7WI,6
+squad-1.96.1.dist-info/RECORD,,