mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 18:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

patchtest: simplify, rename modules

Browse Source 
- simplify base.py, data.py
- move some leftover regex patterns to patterns.py
- remove pyparsing path logic, since this is no longer needed
- rename PatchTestInput class to PatchtestParser
- data.py: rename to patchtest_parser.py
- patterns.py: rename to patchtest_patterns.py
- move PatchTestDataStore to test_metadata.py since that's the only
  place it's used
- remove unused logger code

(From OE-Core rev: 1e971b05b036b0b1eb0bdbd9b26b54d06e74294c)

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Trevor Gamblin
2024-09-24 07:55:01 -04:00
committed by Richard Purdie
parent 18a65c77c0
commit 4c378fc895
8 changed files with 234 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
meta/lib/patchtest/tests/base.py
View File

@@ -8,20 +8,23 @@ import unittest
import logging
import json
import unidiff
from data import PatchTestInput
from patchtest_parser import PatchtestParser
import mailbox
import patchtest_patterns
import collections
import sys
import os
import re
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pyparsing'))
logger = logging.getLogger("patchtest")
debug = logger.debug
info = logger.info
warn = logger.warn
error = logger.error
logger = logging.getLogger('patchtest')
debug=logger.debug
info=logger.info
warn=logger.warn
error=logger.error
Commit = collections.namedtuple(
"Commit", ["author", "subject", "commit_message", "shortlog", "payload"]
)
Commit = collections.namedtuple('Commit', ['author', 'subject', 'commit_message', 'shortlog', 'payload'])
@@ -34,9 +37,6 @@ class PatchtestOEError(Exception):
class Base(unittest.TestCase):
# if unit test fails, fail message will throw at least the following JSON: {"id": <testid>}
endcommit_messages_regex = re.compile(r'\(From \w+-\w+ rev:|(?<!\S)Signed-off-by|(?<!\S)---\n')
patchmetadata_regex = re.compile(r'-{3} \S+|\+{3} \S+|@{2} -\d+,\d+ \+\d+,\d+ @{2} \S+')
@staticmethod
def msg_to_commit(msg):
payload = msg.get_payload()
@@ -49,7 +49,7 @@ class Base(unittest.TestCase):
@staticmethod
def commit_message(payload):
commit_message = payload.__str__()
match = Base.endcommit_messages_regex.search(payload)
match = patchtest_patterns.endcommit_messages_regex.search(payload)
if match:
commit_message = payload[:match.start()]
return commit_message
@@ -65,13 +65,15 @@ class Base(unittest.TestCase):
def setUpClass(cls):
# General objects: mailbox.mbox and patchset
cls.mbox = mailbox.mbox(PatchTestInput.repo.patch.path)
cls.mbox = mailbox.mbox(PatchtestParser.repo.patch.path)
# Patch may be malformed, so try parsing it
cls.unidiff_parse_error = ''
cls.patchset = None
try:
cls.patchset = unidiff.PatchSet.from_filename(PatchTestInput.repo.patch.path, encoding=u'UTF-8')
cls.patchset = unidiff.PatchSet.from_filename(
PatchtestParser.repo.patch.path, encoding="UTF-8"
)
except unidiff.UnidiffParseError as upe:
cls.patchset = []
cls.unidiff_parse_error = str(upe)
@@ -148,7 +150,7 @@ class Metadata(Base):
# import relevant libraries
try:
scripts_path = os.path.join(PatchTestInput.repodir, 'scripts', 'lib')
scripts_path = os.path.join(PatchtestParser.repodir, "scripts", "lib")
if scripts_path not in sys.path:
sys.path.insert(0, scripts_path)
import scriptpath
@@ -223,11 +225,23 @@ class Metadata(Base):
for patch in patchset:
if patch.path.endswith('.bb') or patch.path.endswith('.bbappend') or patch.path.endswith('.inc'):
if patch.is_added_file:
added_paths.append(os.path.join(os.path.abspath(PatchTestInput.repodir), patch.path))
added_paths.append(
os.path.join(
os.path.abspath(PatchtestParser.repodir), patch.path
)
)
elif patch.is_modified_file:
modified_paths.append(os.path.join(os.path.abspath(PatchTestInput.repodir), patch.path))
modified_paths.append(
os.path.join(
os.path.abspath(PatchtestParser.repodir), patch.path
)
)
elif patch.is_removed_file:
removed_paths.append(os.path.join(os.path.abspath(PatchTestInput.repodir), patch.path))
removed_paths.append(
os.path.join(
os.path.abspath(PatchtestParser.repodir), patch.path
)
)
data = cls.tinfoil.cooker.recipecaches[''].pkg_fn.items()