From dc089073eb120de76c8907e476c341ed3e97c164 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Thu, 19 Oct 2023 16:49:27 -0400 Subject: [PATCH] patchtest: test regardless of mergeability Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/patchtest/tests/test_metadata_lic_files_chksum.py | 5 ----- meta/lib/patchtest/tests/test_metadata_license.py | 5 ----- meta/lib/patchtest/tests/test_metadata_summary.py | 5 ----- meta/lib/patchtest/tests/test_python_pylint.py | 2 -- 4 files changed, 17 deletions(-) diff --git a/meta/lib/patchtest/tests/test_metadata_lic_files_chksum.py b/meta/lib/patchtest/tests/test_metadata_lic_files_chksum.py index b2c32507ffe..cb3e7c9d341 100644 --- a/meta/lib/patchtest/tests/test_metadata_lic_files_chksum.py +++ b/meta/lib/patchtest/tests/test_metadata_lic_files_chksum.py @@ -15,11 +15,6 @@ class LicFilesChkSum(base.Metadata): lictag = 'License-Update' lictag_re = pyparsing.Regex("^%s:" % lictag) - def setUp(self): - # these tests just make sense on patches that can be merged - if not PatchTestInput.repo.canbemerged: - self.skip('Patch cannot be merged') - def test_lic_files_chksum_presence(self): if not self.added: self.skip('No added recipes, skipping test') diff --git a/meta/lib/patchtest/tests/test_metadata_license.py b/meta/lib/patchtest/tests/test_metadata_license.py index a5bc03b83fe..1a7f09b7470 100644 --- a/meta/lib/patchtest/tests/test_metadata_license.py +++ b/meta/lib/patchtest/tests/test_metadata_license.py @@ -12,11 +12,6 @@ class License(base.Metadata): metadata = 'LICENSE' invalid_license = 'PATCHTESTINVALID' - def setUp(self): - # these tests just make sense on patches that can be merged - if not PatchTestInput.repo.canbemerged: - self.skip('Patch cannot be merged') - def test_license_presence(self): if not self.added: self.skip('No added recipes, skipping test') diff --git a/meta/lib/patchtest/tests/test_metadata_summary.py b/meta/lib/patchtest/tests/test_metadata_summary.py index 1502863df02..170e79eb4b7 100644 --- a/meta/lib/patchtest/tests/test_metadata_summary.py +++ b/meta/lib/patchtest/tests/test_metadata_summary.py @@ -10,11 +10,6 @@ from data import PatchTestInput class Summary(base.Metadata): metadata = 'SUMMARY' - def setUp(self): - # these tests just make sense on patches that can be merged - if not PatchTestInput.repo.canbemerged: - self.skip('Patch cannot be merged') - def test_summary_presence(self): if not self.added: self.skip('No added recipes, skipping test') diff --git a/meta/lib/patchtest/tests/test_python_pylint.py b/meta/lib/patchtest/tests/test_python_pylint.py index 9cfc491a134..304b2d5ee9a 100644 --- a/meta/lib/patchtest/tests/test_python_pylint.py +++ b/meta/lib/patchtest/tests/test_python_pylint.py @@ -26,8 +26,6 @@ class PyLint(base.Base): def setUp(self): if self.unidiff_parse_error: self.skip('Python-unidiff parse error') - if not PatchTestInput.repo.canbemerged: - self.skip('Patch cannot be merged, no reason to execute the test method') if not PyLint.pythonpatches: self.skip('No python related patches, skipping test') -- 2.47.3