squad 1.93__tar.gz → 1.93.1__tar.gz

{squad-1.93 → squad-1.93.1}/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.93.1
+
+This 1.93.1 release has minor bug fixes on log parser plugin and it silences a warning
+when receiving a job that already exist within a build.
+
 # 1.93
 
 This 1.93 release adds support for a build log parser as well as some other minor bug fixes and improvements.

{squad-1.93/squad.egg-info → squad-1.93.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: squad
-Version: 1.93
+Version: 1.93.1
 Summary: Software Quality Dashboard
 Home-page: https://github.com/Linaro/squad
 Author: Antonio Terceiro

{squad-1.93 → squad-1.93.1}/doc/intro.rst

@@ -232,7 +232,9 @@ strings. The following fields are recognized:
   test run
 * ``datetime``: timestamp of the test run, as a ISO-8601 date
   representation, with seconds. This is the representation that ``date
-  --iso-8601=seconds`` gives you.
+  --iso-8601=seconds`` gives you. If datetime is not supplied in the
+  metadata, the datetime of a test run will be set to the current
+  timestamp during creation.
 * ``job_id``: identifier for the test run. Must be unique for the
   project. **This field is mandatory**
 * ``job_status``: string identifying the status of the project. SQUAD

{squad-1.93 → squad-1.93.1}/squad/ci/models.py

@@ -138,10 +138,8 @@ class Backend(models.Model):
                 completed=completed,
             )
             test_job.testrun = testrun
-        except InvalidMetadata as exception:
+        except (DuplicatedTestJob, InvalidMetadata) as exception:
             test_job.failure = str(exception)
-        except DuplicatedTestJob as exception:
-            logger.error('Failed to fetch test_job(%d): "%s"' % (test_job.id, str(exception)))
 
         if test_job.needs_postprocessing():
             # Offload postprocessing plugins to a new task

{squad-1.93 → squad-1.93.1}/squad/core/models.py

@@ -493,6 +493,9 @@ class Build(models.Model):
         ordering = ['datetime']
 
     def save(self, *args, **kwargs):
+        # Initialize this to timezone.now(), then if a testrun is seen with an
+        # earlier datetime, keep this value up to date with the earliest
+        # testrun.datetime (handled in ReceiveTestRun.__call__).
         if not self.datetime:
             self.datetime = timezone.now()
         with transaction.atomic():
@@ -806,6 +809,9 @@ class TestRun(models.Model):
         unique_together = ('build', 'job_id')
 
     def save(self, *args, **kwargs):
+        # testrun.datetime will take datetime from the metadata if it exists
+        # (during ReceiveTestRun.__call__). If datetime is not in the metadata,
+        # set it to timezone.now()
         if not self.datetime:
             self.datetime = timezone.now()
         if self.__metadata__:

{squad-1.93 → squad-1.93.1}/squad/core/tasks/__init__.py

@@ -178,6 +178,8 @@ class ReceiveTestRun(object):
 
         testrun.refresh_from_db()
 
+        # This keeps the datetime of the build in line with the earliest
+        # observed testrun.datetime.
         if not build.datetime or testrun.datetime < build.datetime:
             build.datetime = testrun.datetime
             build.save()

{squad-1.93 → squad-1.93.1}/squad/plugins/lib/base_log_parser.py

@@ -28,14 +28,29 @@ class BaseLogParser:
         return re.compile(combined, re.S | re.M)
 
     def remove_numbers_and_time(self, snippet):
-        # [ 1067.461794][  T132] BUG: KCSAN: data-race in do_page_fault spectre_v4_enable_task_mitigation
-        # -> [ .][  T] BUG: KCSAN: data-race in do_page_fault spectre_v_enable_task_mitigation
-        without_numbers = re.sub(r"(0x[a-f0-9]+|[<\[][0-9a-f]+?[>\]]|\d+)", "", snippet)
+        # [   92.236941] CPU: 1 PID: 191 Comm: kunit_try_catch Tainted: G        W         5.15.75-rc1 #1
+        # <4>[   87.925462] CPU: 0 PID: 135 Comm: (crub_all) Not tainted 6.7.0-next-20240111 #14
+        # Remove '(Not t|T)ainted', to the end of the line.
+        without_tainted = re.sub(r"(Not t|T)ainted.*", "", snippet)
+
+        # x23: ffff9b7275bc6f90 x22: ffff9b7275bcfb50 x21: fff00000cc80ef88
+        # x20: 1ffff00010668fb8 x19: ffff8000800879f0 x18: 00000000805c0b5c
+        # Remove words with hex numbers.
+        # <3>[    2.491276][    T1] BUG: KCSAN: data-race in console_emit_next_record / console_trylock_spinning
+        # -> <>[    .][    T1] BUG: KCSAN: data-race in console_emit_next_record / console_trylock_spinning
+        without_hex = re.sub(r"\b(?:0x)?[a-fA-F0-9]+\b", "", without_tainted)
+
+        # <>[ 1067.461794][  T132] BUG: KCSAN: data-race in do_page_fault spectre_v4_enable_task_mitigation
+        # -> <>[ .][  T132] BUG: KCSAN: data-race in do_page_fault spectre_v_enable_task_mitigation
+        # But should not remove numbers from functions.
+        without_numbers = re.sub(
+            r"(0x[a-f0-9]+|[<\[][0-9a-f]+?[>\]]|\b\d+\b(?!\s*\())", "", without_hex
+        )
 
-        # [ .][  T] BUG: KCSAN: data-race in do_page_fault spectre_v_enable_task_mitigation
+        # <>[ .][  T132] BUG: KCSAN: data-race in do_page_fault spectre_v_enable_task_mitigation
         # ->  BUG: KCSAN: data-race in do_page_fault spectre_v_enable_task_mitigation
         without_time = re.sub(
-            f"^{square_brackets_and_contents}({square_brackets_and_contents})?",
+            f"^<?>?{square_brackets_and_contents}({square_brackets_and_contents})?",
             "",
             without_numbers,
         )  # noqa

{squad-1.93 → squad-1.93.1}/squad/plugins/linux_log_parser_build.py

@@ -200,9 +200,11 @@ class Plugin(BasePlugin, BaseLogParser):
             # there is a match
             return None
         snippet = matches[0]
-        without_numbers_and_time = self.remove_numbers_and_time(snippet)
+        without_numbers = re.sub(
+            r"(0x[a-f0-9]+|[<\[][0-9a-f]+?[>\]]|\b\d+\b(?!\s*\())", "", snippet
+        )
 
-        name = slugify(self.post_process_test_name(without_numbers_and_time))
+        name = slugify(self.post_process_test_name(without_numbers))
 
         return name
 

squad-1.93.1/squad/version.py

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

{squad-1.93 → squad-1.93.1/squad.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: squad
-Version: 1.93
+Version: 1.93.1
 Summary: Software Quality Dashboard
 Home-page: https://github.com/Linaro/squad
 Author: Antonio Terceiro

{squad-1.93 → squad-1.93.1}/squad.egg-info/SOURCES.txt

@@ -621,6 +621,8 @@ test/plugins/test_linux_log_parser.py
 test/plugins/test_linux_log_parser_build.py
 test/plugins/test_log_parser_base.py
 test/plugins/test_plugin.py
+test/plugins/linux_log_parser/different-numbers-in-function-name-oops.log
+test/plugins/linux_log_parser/duplicated-oops.log
 test/plugins/linux_log_parser/internal-error-oops.log
 test/plugins/linux_log_parser/kasan.log
 test/plugins/linux_log_parser/kcsan_full_log.log

{squad-1.93 → squad-1.93.1}/test/ci/test_models.py

@@ -168,7 +168,7 @@ class BackendFetchTest(BackendTestBase):
 
     @patch('django.utils.timezone.now', return_value=NOW)
     @patch('squad.ci.models.Backend.get_implementation')
-    def test_fetch_sets_fetched_on_invalid_metadata(self, get_implementation, __now__):
+    def test_fetch_sets_fetched_on_duplicated_job(self, get_implementation, __now__):
         metadata = {"foo": "bar"}
         tests = {"foo": "pass"}
         metrics = {"bar": {"value": 1, "unit": "nuggets"}}
@@ -198,7 +198,7 @@ class BackendFetchTest(BackendTestBase):
 
         test_job.refresh_from_db()
         self.assertTrue(test_job.fetched)
-        self.assertIsNone(test_job.failure)
+        self.assertEqual('There is already a test run with job_id 999', test_job.failure)
 
     @patch('django.utils.timezone.now', return_value=NOW)
     @patch('squad.ci.models.Backend.get_implementation')

{squad-1.93 → squad-1.93.1}/test/core/test_tasks.py

@@ -7,7 +7,7 @@ import yaml
 from dateutil.relativedelta import relativedelta
 from django.test import TestCase
 from django.utils import timezone
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 
 from squad.core.models import Group, TestRun, Status, Build, ProjectStatus, SuiteVersion, PatchSource, KnownIssue, EmailTemplate, Callback
@@ -581,6 +581,27 @@ class ReceiveTestRunTest(TestCase):
 
         self.assertEqual(yesterday, build.datetime)
 
+    def test_build_datetime_not_in_metadata(self):
+        # In the case where datetime is not in metadata, check it is set to
+        # timezone.now()
+
+        #  Mock datetime so we can check it at the end
+        now_mocked = timezone.now()
+        with patch('django.utils.timezone.now', Mock(return_value=now_mocked)):
+            receive = ReceiveTestRun(self.project)
+
+            metadata = {
+                "job_id": '999',
+                "job_status": 'pass',
+                "job_url": 'https://example.com/jobs/999',
+                "build_url": 'https://example/com/builds/777',
+            }
+
+            receive('199', 'myenv', metadata_file=json.dumps(metadata))
+            build = Build.objects.get(version='199')
+
+            self.assertEqual(now_mocked, build.datetime)
+
     @patch('squad.core.tasks.ValidateTestRun.__call__')
     def test_should_validate_test_run(self, validator_mock):
         validator_mock.side_effect = RuntimeError('crashed')

squad-1.93.1/test/plugins/linux_log_parser/different-numbers-in-function-name-oops.log

@@ -0,0 +1,53 @@
+[  140.297674] Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP
+[  140.298941] Modules linked in:
+[  140.299833] CPU: 1 UID: 0 PID: 620 Comm: kunit_try_catch_32k Tainted: G    B            N 6.13.0-rc7 #1
+[  140.300812] Tainted: [B]=BAD_PAGE, [N]=TEST
+[  140.301340] Hardware name: linux,dummy-virt (DT)
+[  140.302131] pstate: 12402009 (nzcV daif +PAN -UAO +TCO -DIT -SSBS BTYPE=--)
+[  140.303752] pc : kunit_test_null_dereference+0x70/0x170
+[  140.304314] lr : kunit_generic_run_threadfn_adapter+0x88/0x100
+[  140.305223] sp : ffff800083347dc0
+[  140.305778] x29: ffff800083347e20 x28: 0000000000000000 x27: 0000000000000000
+[  140.307079] x26: 0000000000000000 x25: 0000000000000000 x24: fff00000cc80ef80
+[  140.308158] x23: ffff9b7275bc6f90 x22: ffff9b7275bcfb50 x21: fff00000cc80ef88
+[  140.309193] x20: 1ffff00010668fb8 x19: ffff8000800879f0 x18: 00000000805c0b5c
+[  140.310184] x17: 0000000000000001 x16: fff00000da505ca0 x15: 00000000007e992b
+[  140.311172] x14: 00000000ca2562db x13: 1ffe00001815cb24 x12: fffd800018da43a2
+[  140.312208] x11: 1ffe000018da43a1 x10: fffd800018da43a1 x9 : ffff9b7275bc7018
+[  140.313293] x8 : ffff800083347cb8 x7 : 0000000000000001 x6 : 0000000041b58ab3
+[  140.314333] x5 : ffff700010668fb8 x4 : 00000000f1f1f1f1 x3 : 0000000000000003
+[  140.315379] x2 : dfff800000000000 x1 : fff00000c6d21440 x0 : ffff8000800879f0
+[  140.316474] Call trace:
+[  140.316927]  kunit_test_null_dereference+0x70/0x170 (P)
+[  140.317646]  kunit_generic_run_threadfn_adapter+0x88/0x100
+[  140.318315]  kthread+0x24c/0x2d0
+[  140.318860]  ret_from_fork+0x10/0x20
+[  140.320008] Code: b90004a3 d5384101 52800063 aa0003f3 (39c00042)
+[  140.321163] ---[ end trace 0000000000000000 ]---
+
+[  112.633643] Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP
+[  112.635528] Modules linked in:
+[  112.636558] CPU: 0 UID: 0 PID: 621 Comm: kunit_try_catch_64k Tainted: G    B            N 6.13.0-rc7 #1
+[  112.637505] Tainted: [B]=BAD_PAGE, [N]=TEST
+[  112.638145] Hardware name: linux,dummy-virt (DT)
+[  112.638662] pstate: 12402009 (nzcV daif +PAN -UAO +TCO -DIT -SSBS BTYPE=--)
+[  112.639813] pc : kunit_test_null_dereference+0x70/0x170
+[  112.640694] lr : kunit_generic_run_threadfn_adapter+0x88/0x100
+[  112.641563] sp : ffff800083177dc0
+[  112.641998] x29: ffff800083177e20 x28: 0000000000000000 x27: 0000000000000000
+[  112.643470] x26: 0000000000000000 x25: 0000000000000000 x24: fff00000c9daff00
+[  112.644889] x23: ffff9b153cfc6f90 x22: ffff9b153cfcfb50 x21: fff00000c9daff08
+[  112.645963] x20: 1ffff0001062efb8 x19: ffff8000800879f0 x18: 00000000a76e9934
+[  112.646909] x17: 000000008055b2b1 x16: 0000000000000100 x15: 0000000000000000
+[  112.648068] x14: 1ffe00001b49c778 x13: fff00000da4e3c98 x12: fffd8000191643a2
+[  112.649116] x11: 1ffe0000191643a1 x10: fffd8000191643a1 x9 : ffff9b153cfc7018
+[  112.650156] x8 : ffff800083177cb8 x7 : 0000000000000001 x6 : 0000000041b58ab3
+[  112.651201] x5 : ffff70001062efb8 x4 : 00000000f1f1f1f1 x3 : 0000000000000003
+[  112.652392] x2 : dfff800000000000 x1 : fff00000c8b21440 x0 : ffff8000800879f0
+[  112.653691] Call trace:
+[  112.654100]  kunit_test_null_dereference+0x70/0x170 (P)
+[  112.654712]  kunit_generic_run_threadfn_adapter+0x88/0x100
+[  112.655400]  kthread+0x24c/0x2d0
+[  112.655931]  ret_from_fork+0x10/0x20
+[  112.657443] Code: b90004a3 d5384101 52800063 aa0003f3 (39c00042)
+[  112.658772] ---[ end trace 0000000000000000 ]---

squad-1.93.1/test/plugins/linux_log_parser/duplicated-oops.log

@@ -0,0 +1,53 @@
+[  140.297674] Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP
+[  140.298941] Modules linked in:
+[  140.299833] CPU: 1 UID: 0 PID: 620 Comm: kunit_try_catch Tainted: G    B            N 6.13.0-rc7 #1
+[  140.300812] Tainted: [B]=BAD_PAGE, [N]=TEST
+[  140.301340] Hardware name: linux,dummy-virt (DT)
+[  140.302131] pstate: 12402009 (nzcV daif +PAN -UAO +TCO -DIT -SSBS BTYPE=--)
+[  140.303752] pc : kunit_test_null_dereference+0x70/0x170
+[  140.304314] lr : kunit_generic_run_threadfn_adapter+0x88/0x100
+[  140.305223] sp : ffff800083347dc0
+[  140.305778] x29: ffff800083347e20 x28: 0000000000000000 x27: 0000000000000000
+[  140.307079] x26: 0000000000000000 x25: 0000000000000000 x24: fff00000cc80ef80
+[  140.308158] x23: ffff9b7275bc6f90 x22: ffff9b7275bcfb50 x21: fff00000cc80ef88
+[  140.309193] x20: 1ffff00010668fb8 x19: ffff8000800879f0 x18: 00000000805c0b5c
+[  140.310184] x17: 0000000000000001 x16: fff00000da505ca0 x15: 00000000007e992b
+[  140.311172] x14: 00000000ca2562db x13: 1ffe00001815cb24 x12: fffd800018da43a2
+[  140.312208] x11: 1ffe000018da43a1 x10: fffd800018da43a1 x9 : ffff9b7275bc7018
+[  140.313293] x8 : ffff800083347cb8 x7 : 0000000000000001 x6 : 0000000041b58ab3
+[  140.314333] x5 : ffff700010668fb8 x4 : 00000000f1f1f1f1 x3 : 0000000000000003
+[  140.315379] x2 : dfff800000000000 x1 : fff00000c6d21440 x0 : ffff8000800879f0
+[  140.316474] Call trace:
+[  140.316927]  kunit_test_null_dereference+0x70/0x170 (P)
+[  140.317646]  kunit_generic_run_threadfn_adapter+0x88/0x100
+[  140.318315]  kthread+0x24c/0x2d0
+[  140.318860]  ret_from_fork+0x10/0x20
+[  140.320008] Code: b90004a3 d5384101 52800063 aa0003f3 (39c00042)
+[  140.321163] ---[ end trace 0000000000000000 ]---
+
+[  112.633643] Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP
+[  112.635528] Modules linked in:
+[  112.636558] CPU: 0 UID: 0 PID: 621 Comm: kunit_try_catch Tainted: G    B            N 6.13.0-rc7 #1
+[  112.637505] Tainted: [B]=BAD_PAGE, [N]=TEST
+[  112.638145] Hardware name: linux,dummy-virt (DT)
+[  112.638662] pstate: 12402009 (nzcV daif +PAN -UAO +TCO -DIT -SSBS BTYPE=--)
+[  112.639813] pc : kunit_test_null_dereference+0x70/0x170
+[  112.640694] lr : kunit_generic_run_threadfn_adapter+0x88/0x100
+[  112.641563] sp : ffff800083177dc0
+[  112.641998] x29: ffff800083177e20 x28: 0000000000000000 x27: 0000000000000000
+[  112.643470] x26: 0000000000000000 x25: 0000000000000000 x24: fff00000c9daff00
+[  112.644889] x23: ffff9b153cfc6f90 x22: ffff9b153cfcfb50 x21: fff00000c9daff08
+[  112.645963] x20: 1ffff0001062efb8 x19: ffff8000800879f0 x18: 00000000a76e9934
+[  112.646909] x17: 000000008055b2b1 x16: 0000000000000100 x15: 0000000000000000
+[  112.648068] x14: 1ffe00001b49c778 x13: fff00000da4e3c98 x12: fffd8000191643a2
+[  112.649116] x11: 1ffe0000191643a1 x10: fffd8000191643a1 x9 : ffff9b153cfc7018
+[  112.650156] x8 : ffff800083177cb8 x7 : 0000000000000001 x6 : 0000000041b58ab3
+[  112.651201] x5 : ffff70001062efb8 x4 : 00000000f1f1f1f1 x3 : 0000000000000003
+[  112.652392] x2 : dfff800000000000 x1 : fff00000c8b21440 x0 : ffff8000800879f0
+[  112.653691] Call trace:
+[  112.654100]  kunit_test_null_dereference+0x70/0x170 (P)
+[  112.654712]  kunit_generic_run_threadfn_adapter+0x88/0x100
+[  112.655400]  kthread+0x24c/0x2d0
+[  112.655931]  ret_from_fork+0x10/0x20
+[  112.657443] Code: b90004a3 d5384101 52800063 aa0003f3 (39c00042)
+[  112.658772] ---[ end trace 0000000000000000 ]---

{squad-1.93 → squad-1.93.1}/test/plugins/test_linux_log_parser.py

@@ -64,7 +64,7 @@ class TestLinuxLogParser(TestCase):
         testrun = self.new_testrun('kernelexceptiontrace.log')
         self.plugin.postprocess_testrun(testrun)
 
-        test = testrun.tests.get(suite__slug='log-parser-test', metadata__name='exception-warning-cpu-pid-at-kernelsmpc-smp_call_function_many_cond')
+        test = testrun.tests.get(suite__slug='log-parser-test', metadata__name='exception-warning-cpu-pid-at-kernelsmp-smp_call_function_many_cond')
         self.assertFalse(test.result)
         self.assertIsNotNone(test.log)
         self.assertNotIn('Booting Linux', test.log)
@@ -76,7 +76,7 @@ class TestLinuxLogParser(TestCase):
         testrun = self.new_testrun('kernelexceptiontrace_without_squarebraces.log')
         self.plugin.postprocess_testrun(testrun)
 
-        test = testrun.tests.get(suite__slug='log-parser-test', metadata__name='exception-warning-cpu-pid-at-kernelsmpc-smp_call_function_many_cond')
+        test = testrun.tests.get(suite__slug='log-parser-test', metadata__name='exception-warning-cpu-pid-at-kernelsmp-smp_call_function_many_cond')
         self.assertFalse(test.result)
         self.assertIsNotNone(test.log)
         self.assertNotIn('Booting Linux', test.log)
@@ -101,7 +101,7 @@ class TestLinuxLogParser(TestCase):
         testrun = self.new_testrun('kcsan_simple.log')
         self.plugin.postprocess_testrun(testrun)
 
-        test = testrun.tests.get(suite__slug='log-parser-test', metadata__name='kcsan-bug-kcsan-data-race-in-do_page_fault-spectre_v_enable_task_mitigation')
+        test = testrun.tests.get(suite__slug='log-parser-test', metadata__name='kcsan-bug-kcsan-data-race-in-do_page_fault-spectre_v4_enable_task_mitigation')
 
         self.assertFalse(test.result)
         self.assertIsNotNone(test.log)
@@ -175,8 +175,7 @@ class TestLinuxLogParser(TestCase):
 
         testrun = self.new_testrun('kernel_bug_and_invalid_opcode.log', job_id='1000')
         self.plugin.postprocess_testrun(testrun)
-
-        test = testrun.tests.get(suite__slug='log-parser-test', metadata__name='exception-kernel-bug-at-usrsrckernelarchxkvmmmummuc')
+        test = testrun.tests.get(suite__slug='log-parser-test', metadata__name='exception-kernel-bug-at-usrsrckernelarchx86kvmmmummu')
         self.assertFalse(test.result)
         self.assertIsNotNone(test.log)
         self.assertNotIn('Booting Linux', test.log)
@@ -201,9 +200,9 @@ class TestLinuxLogParser(TestCase):
         self.plugin.postprocess_testrun(testrun)
 
         tests = testrun.tests
-        test_panic = tests.get(suite__slug='log-parser-test', metadata__name='panic-multiline-kernel-panic-not-syncing-stack-protector-kernel-stack-is-corrupted-in-ffffffffcc')
-        test_exception = tests.get(suite__slug='log-parser-test', metadata__name='exception-warning-cpu-pid-at-driversgpudrmradeonradeon_objectc-radeon_ttm_bo_destroy')
-        test_warning = tests.get(suite__slug='log-parser-test', metadata__name='warning-warning-cpu-pid-at-driversregulatorcorec-_regulator_putpart')
+        test_panic = tests.get(suite__slug='log-parser-test', metadata__name='panic-multiline-kernel-panic-not-syncing-stack-protector-kernel-stack-is-corrupted-in')
+        test_exception = tests.get(suite__slug='log-parser-test', metadata__name='exception-warning-cpu-pid-at-driversgpudrmradeonradeon_object-radeon_ttm_bo_destroy')
+        test_warning = tests.get(suite__slug='log-parser-test', metadata__name='warning-warning-cpu-pid-at-driversregulatorcore-_regulator_putpart')
         test_oops = tests.get(suite__slug='log-parser-test', metadata__name='oops-oops-preempt-smp')
         test_fault = tests.get(suite__slug='log-parser-test', metadata__name='fault-unhandled-fault-external-abort-on-non-linefetch-at')
 
@@ -298,7 +297,7 @@ class TestLinuxLogParser(TestCase):
         self.assertNotIn('Kernel panic', test.log)
 
         # Now check if a test with sha digest in the name
-        test = testrun.tests.get(suite__slug='log-parser-boot', metadata__name='internal-error-oops-oops-bug-preempt-smp-112aca90e0eaf87ac104ae4e9aeea46f2757ac81faf013c77696d081c109aecc')
+        test = testrun.tests.get(suite__slug='log-parser-boot', metadata__name='internal-error-oops-oops-bug-preempt-smp-5c448a8183918455f8d9381bb4b6ee8a593b25c4aeaa85d376fa0fd9cbd5840c')
         self.assertFalse(test.result)
         self.assertIsNotNone(test.log)
         self.assertIn('Internal error: Oops - BUG: 0 [#0] PREEMPT SMP', test.log)
@@ -310,9 +309,9 @@ class TestLinuxLogParser(TestCase):
 
         tests = testrun.tests
 
-        test_panic = tests.get(suite__slug='log-parser-test', metadata__name='panic-multiline-kernel-panic-not-syncing-stack-protector-kernel-stack-is-corrupted-in-ffffffffcc-18fbe2dd02a2df7ba9e8d2ef289ca7b76beb8f8f8253621ff47902378ee6df11')
-        test_exception = tests.get(suite__slug='log-parser-test', metadata__name='exception-warning-cpu-pid-at-driversgpudrmradeonradeon_objectc-radeon_ttm_bo_destroy-77251099bfa081e5c942070a569fe31163336e61a80bda7304cd59f0f4b82080')
-        test_warning = tests.get(suite__slug='log-parser-test', metadata__name='warning-warning-cpu-pid-at-driversregulatorcorec-_regulator_putpart-d44949024d5373185a7381cb9dd291b13c117d6b93feb576a431e5376025004f')
+        test_panic = tests.get(suite__slug='log-parser-test', metadata__name='panic-multiline-kernel-panic-not-syncing-stack-protector-kernel-stack-is-corrupted-in-630e6949dbf4d18f6ab71c0864524cf3e60da1380fe7fd5acbb99d8f5d01ab21')
+        test_exception = tests.get(suite__slug='log-parser-test', metadata__name='exception-warning-cpu-pid-at-driversgpudrmradeonradeon_object-radeon_ttm_bo_destroy-51fc34b6c857dfc70f7ee985b21731cc1745e97a216193a258a1ad90a6cbb9c8')
+        test_warning = tests.get(suite__slug='log-parser-test', metadata__name='warning-warning-cpu-pid-at-driversgpudrmradeonradeon_object-radeon_ttm_bo_destroy-dc992cca96cada94f4930abe87d60c6de25d404f11313bd64f2217d9408e15ef')
         test_oops = tests.get(suite__slug='log-parser-test', metadata__name='oops-oops-preempt-smp-4e1ddddb2c142178a8977e7d973c2a13db2bb978aa471c0049ee39fe3fe4d74c')
         test_fault = tests.get(suite__slug='log-parser-test', metadata__name='fault-unhandled-fault-external-abort-on-non-linefetch-at-6f9e3ab8f97e35c1e9167fed1e01c6149986819c54451064322b7d4208528e07')
 
@@ -347,3 +346,17 @@ class TestLinuxLogParser(TestCase):
         self.assertNotIn('WARNING: CPU', test_fault.log)
         self.assertNotIn('Oops', test_fault.log)
         self.assertIn('Unhandled fault:', test_fault.log)
+
+    def test_same_sha(self):
+        testrun = self.new_testrun('duplicated-oops.log')
+        self.plugin.postprocess_testrun(testrun)
+
+        tests = testrun.tests.all()
+        self.assertEqual(2, tests.count())
+
+    def test_numbers_in_function_name(self):
+        testrun = self.new_testrun('different-numbers-in-function-name-oops.log')
+        self.plugin.postprocess_testrun(testrun)
+
+        tests = testrun.tests.all()
+        self.assertEqual(3, tests.count())

{squad-1.93 → squad-1.93.1}/test/plugins/test_log_parser_base.py

@@ -94,9 +94,40 @@ class TestBaseLogParser(TestCase):
             sha_sum, "1e8e593de88f4856fc03d46c4156cf0772898309f8a796595f549bcabfc1cb9f"
         )
 
-    def test_create_name_log_dict(self):
+    def test_create_name_log_dict_exclude_numbers(self):
         """
-        Test creating the dict containing the "name" and "log lines" pairs
+        Test creating the dict containing the "name" and "log lines" pairs -
+        case where we want to exclude the numbers before doing the SHA
+        """
+        tests_without_shas_to_create, tests_with_shas_to_create = (
+            self.log_parser.create_name_log_dict(
+                "test_name", ["log lines 1", "log lines 2"]
+            )
+        )
+        expected_tests_without_shas_to_create = defaultdict(
+            set, {"test_name": {"log lines 1", "log lines 2"}}
+        )
+        expected_tests_with_shas_to_create = defaultdict(
+            set,
+            {
+                "test_name-1677bef240c981a91c7f0c4321668491ff18f224ee5f4191feaa1940b09ccdaa": {
+                    "log lines 1",
+                    "log lines 2",
+                }
+            },
+        )
+
+        self.assertDictEqual(
+            tests_without_shas_to_create, expected_tests_without_shas_to_create
+        )
+        self.assertDictEqual(
+            tests_with_shas_to_create, expected_tests_with_shas_to_create
+        )
+
+    def test_create_name_log_dict_keep_numbers(self):
+        """
+        Test creating the dict containing the "name" and "log lines" pairs -
+        case where we want to keep the numbers before doing the SHA
         """
         tests_without_shas_to_create, tests_with_shas_to_create = (
             self.log_parser.create_name_log_dict(
@@ -109,8 +140,10 @@ class TestBaseLogParser(TestCase):
         expected_tests_with_shas_to_create = defaultdict(
             set,
             {
-                "test_name-2b06e6aa0f681d2b9d2de6b1e91d4b25cea58b5ce9c3dcd64b429766a8b0ecb1": {
+                "test_name-8166dde0dc110dc6d0064b55e0d09fb4589f6d68e4aa5580376858e290f4bc91": {
                     "log lines1",
+                },
+                "test_name-335a19ed20ff0d0b276e1120a5761802bb3c7ce416b24ef69b5ba4b247832f92": {
                     "log lines2",
                 }
             },
@@ -194,7 +227,7 @@ class TestBaseLogParser(TestCase):
             slug="log-parser-test"
         )
         self.log_parser.create_squad_tests(
-            self.testrun, suite, "test_name", {"log lines1", "log lines2"}
+            self.testrun, suite, "test_name", {"log lines 1", "log lines 2"}
         )
 
         test = self.testrun.tests.get(
@@ -205,12 +238,12 @@ class TestBaseLogParser(TestCase):
 
         test_with_sha = self.testrun.tests.get(
             suite__slug="log-parser-test",
-            metadata__name="test_name-2b06e6aa0f681d2b9d2de6b1e91d4b25cea58b5ce9c3dcd64b429766a8b0ecb1",
+            metadata__name="test_name-1677bef240c981a91c7f0c4321668491ff18f224ee5f4191feaa1940b09ccdaa",
         )
         self.assertFalse(test_with_sha.result)
         self.assertIsNotNone(test_with_sha.log)
-        self.assertIn("log lines1", test_with_sha.log)
-        self.assertIn("log lines2", test_with_sha.log)
+        self.assertIn("log lines 1", test_with_sha.log)
+        self.assertIn("log lines 2", test_with_sha.log)
 
     def test_compile_regex_single(self):
         regex = [

squad-1.93/squad/version.py

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