diff options
Diffstat (limited to 'meta/lib/patchtest/tests/test_patch_upstream_status.py')
-rw-r--r-- | meta/lib/patchtest/tests/test_patch_upstream_status.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/lib/patchtest/tests/test_patch_upstream_status.py b/meta/lib/patchtest/tests/test_patch_upstream_status.py index eda5353c66..c21aeaf28f 100644 --- a/meta/lib/patchtest/tests/test_patch_upstream_status.py +++ b/meta/lib/patchtest/tests/test_patch_upstream_status.py | |||
@@ -34,8 +34,7 @@ class PatchUpstreamStatus(base.Base): | |||
34 | for newpatch in PatchUpstreamStatus.newpatches: | 34 | for newpatch in PatchUpstreamStatus.newpatches: |
35 | payload = newpatch.__str__() | 35 | payload = newpatch.__str__() |
36 | if not self.upstream_status_regex.search_string(payload): | 36 | if not self.upstream_status_regex.search_string(payload): |
37 | self.fail('Added patch file is missing Upstream-Status in the header', | 37 | self.fail('Added patch file is missing Upstream-Status in the header. Add Upstream-Status: <Valid status> to the header', |
38 | 'Add Upstream-Status: <Valid status> to the header of %s' % newpatch.path, | ||
39 | data=[('Standard format', self.standard_format), ('Valid status', self.valid_status)]) | 38 | data=[('Standard format', self.standard_format), ('Valid status', self.valid_status)]) |
40 | for line in payload.splitlines(): | 39 | for line in payload.splitlines(): |
41 | if self.patchmetadata_regex.match(line): | 40 | if self.patchmetadata_regex.match(line): |
@@ -46,19 +45,16 @@ class PatchUpstreamStatus(base.Base): | |||
46 | parse_upstream_status.upstream_status_inappropriate_info.parseString(line.lstrip('+')) | 45 | parse_upstream_status.upstream_status_inappropriate_info.parseString(line.lstrip('+')) |
47 | except pyparsing.ParseException as pe: | 46 | except pyparsing.ParseException as pe: |
48 | self.fail('Upstream-Status is Inappropriate, but no reason was provided', | 47 | self.fail('Upstream-Status is Inappropriate, but no reason was provided', |
49 | 'Include a brief reason why %s is inappropriate' % os.path.basename(newpatch.path), | ||
50 | data=[('Current', pe.pstr), ('Standard format', 'Upstream-Status: Inappropriate [reason]')]) | 48 | data=[('Current', pe.pstr), ('Standard format', 'Upstream-Status: Inappropriate [reason]')]) |
51 | elif parse_upstream_status.submitted_status_mark.searchString(line): | 49 | elif parse_upstream_status.submitted_status_mark.searchString(line): |
52 | try: | 50 | try: |
53 | parse_upstream_status.upstream_status_submitted_info.parseString(line.lstrip('+')) | 51 | parse_upstream_status.upstream_status_submitted_info.parseString(line.lstrip('+')) |
54 | except pyparsing.ParseException as pe: | 52 | except pyparsing.ParseException as pe: |
55 | self.fail('Upstream-Status is Submitted, but it is not mentioned where', | 53 | self.fail('Upstream-Status is Submitted, but it is not mentioned where', |
56 | 'Include where %s was submitted' % os.path.basename(newpatch.path), | ||
57 | data=[('Current', pe.pstr), ('Standard format', 'Upstream-Status: Submitted [where]')]) | 54 | data=[('Current', pe.pstr), ('Standard format', 'Upstream-Status: Submitted [where]')]) |
58 | else: | 55 | else: |
59 | try: | 56 | try: |
60 | parse_upstream_status.upstream_status.parseString(line.lstrip('+')) | 57 | parse_upstream_status.upstream_status.parseString(line.lstrip('+')) |
61 | except pyparsing.ParseException as pe: | 58 | except pyparsing.ParseException as pe: |
62 | self.fail('Upstream-Status is in incorrect format', | 59 | self.fail('Upstream-Status is in incorrect format', |
63 | 'Fix Upstream-Status format in %s' % os.path.basename(newpatch.path), | ||
64 | data=[('Current', pe.pstr), ('Standard format', self.standard_format), ('Valid status', self.valid_status)]) | 60 | data=[('Current', pe.pstr), ('Standard format', self.standard_format), ('Valid status', self.valid_status)]) |