From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- testing/mozbase/manifestparser/manifestparser/toml.py | 8 +++++++- testing/mozbase/manifestparser/tests/test_manifestparser.py | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'testing/mozbase/manifestparser') diff --git a/testing/mozbase/manifestparser/manifestparser/toml.py b/testing/mozbase/manifestparser/manifestparser/toml.py index e028a4b0d7..4defd99156 100644 --- a/testing/mozbase/manifestparser/manifestparser/toml.py +++ b/testing/mozbase/manifestparser/manifestparser/toml.py @@ -163,8 +163,14 @@ def read_toml( # merge combined defaults into each section sections = [(i, combine_fields(defaults, j)) for i, j in sections] - if not document: + if document: + # Take the line where the test name appears in the file. + for i, _ in enumerate(sections): + line = contents.split(sections[i][0])[0].count(os.linesep) + 1 + manifest.setdefault(sections[i][0], {})["lineno"] = str(line) + else: manifest = None + return sections, defaults, manifest diff --git a/testing/mozbase/manifestparser/tests/test_manifestparser.py b/testing/mozbase/manifestparser/tests/test_manifestparser.py index f1774cfffb..ddbc6ecc79 100755 --- a/testing/mozbase/manifestparser/tests/test_manifestparser.py +++ b/testing/mozbase/manifestparser/tests/test_manifestparser.py @@ -5,6 +5,7 @@ # You can obtain one at http://mozilla.org/MPL/2.0/. import os +import re import shutil import tempfile import unittest @@ -620,6 +621,12 @@ yellow = submarine after = "edit-manifest-after.toml" after_path = os.path.join(here, after) after_str = open(after_path, "r", encoding="utf-8").read() + + # Define the regex pattern to match lines containing 'lineno' + pattern = re.compile(r"^.*lineno.*$\n?", re.MULTILINE) + # Remove lines containing 'lineno' + manifest_str = re.sub(pattern, "", manifest_str) + assert manifest_str == after_str -- cgit v1.2.3