Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 14 insertions, 1 deletions

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