@@ -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')
@@ -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')
@@ -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')
@@ -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')
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> --- 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(-)