summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/patchtest/tests/test_metadata_lic_files_chksum.py5
-rw-r--r--meta/lib/patchtest/tests/test_metadata_license.py5
-rw-r--r--meta/lib/patchtest/tests/test_metadata_summary.py5
-rw-r--r--meta/lib/patchtest/tests/test_python_pylint.py2
4 files changed, 0 insertions, 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 b2c32507ff..cb3e7c9d34 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):
15 lictag = 'License-Update' 15 lictag = 'License-Update'
16 lictag_re = pyparsing.Regex("^%s:" % lictag) 16 lictag_re = pyparsing.Regex("^%s:" % lictag)
17 17
18 def setUp(self):
19 # these tests just make sense on patches that can be merged
20 if not PatchTestInput.repo.canbemerged:
21 self.skip('Patch cannot be merged')
22
23 def test_lic_files_chksum_presence(self): 18 def test_lic_files_chksum_presence(self):
24 if not self.added: 19 if not self.added:
25 self.skip('No added recipes, skipping test') 20 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 a5bc03b83f..1a7f09b747 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):
12 metadata = 'LICENSE' 12 metadata = 'LICENSE'
13 invalid_license = 'PATCHTESTINVALID' 13 invalid_license = 'PATCHTESTINVALID'
14 14
15 def setUp(self):
16 # these tests just make sense on patches that can be merged
17 if not PatchTestInput.repo.canbemerged:
18 self.skip('Patch cannot be merged')
19
20 def test_license_presence(self): 15 def test_license_presence(self):
21 if not self.added: 16 if not self.added:
22 self.skip('No added recipes, skipping test') 17 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 1502863df0..170e79eb4b 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
10class Summary(base.Metadata): 10class Summary(base.Metadata):
11 metadata = 'SUMMARY' 11 metadata = 'SUMMARY'
12 12
13 def setUp(self):
14 # these tests just make sense on patches that can be merged
15 if not PatchTestInput.repo.canbemerged:
16 self.skip('Patch cannot be merged')
17
18 def test_summary_presence(self): 13 def test_summary_presence(self):
19 if not self.added: 14 if not self.added:
20 self.skip('No added recipes, skipping test') 15 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 9cfc491a13..304b2d5ee9 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):
26 def setUp(self): 26 def setUp(self):
27 if self.unidiff_parse_error: 27 if self.unidiff_parse_error:
28 self.skip('Python-unidiff parse error') 28 self.skip('Python-unidiff parse error')
29 if not PatchTestInput.repo.canbemerged:
30 self.skip('Patch cannot be merged, no reason to execute the test method')
31 if not PyLint.pythonpatches: 29 if not PyLint.pythonpatches:
32 self.skip('No python related patches, skipping test') 30 self.skip('No python related patches, skipping test')
33 31