зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1877105 - Add git source support to test_fluent_migrations. r=flod,bolsson
Adds a CLI option `--l10n-git` that uses the firefox-l10n-source git repo instead of the gecko-strings hg repo when testing Fluent migrations. When we complete the git migration, the option and mercurial repo support should be removed. Differential Revision: https://phabricator.services.mozilla.com/D200184
This commit is contained in:
Eemeli Aro
Родитель
c66f71a403
Коммит
815fbb22ec
|
|
@ -4,42 +4,67 @@ import os
|
|||
import re
|
||||
import shutil
|
||||
import sys
|
||||
from datetime import datetime, timedelta
|
||||
from difflib import unified_diff
|
||||
from typing import Iterable
|
||||
|
||||
import hglib
|
||||
import mozpack.path as mozpath
|
||||
from compare_locales.merge import merge_channels
|
||||
from compare_locales.paths.configparser import TOMLParser
|
||||
from compare_locales.paths.files import ProjectFiles
|
||||
from fluent.migrate import validator
|
||||
from fluent.migrate.repo_client import RepoClient, git
|
||||
from fluent.migrate.validator import Validator
|
||||
from fluent.syntax import FluentParser, FluentSerializer
|
||||
from mach.util import get_state_dir
|
||||
from mozpack.path import join, normpath
|
||||
from mozversioncontrol.repoupdate import update_git_repo, update_mercurial_repo
|
||||
|
||||
L10N_SOURCE_NAME = "l10n-source"
|
||||
L10N_SOURCE_REPO = "https://github.com/mozilla-l10n/firefox-l10n-source.git"
|
||||
|
||||
STRINGS_NAME = "gecko-strings"
|
||||
STRINGS_REPO = "https://hg.mozilla.org/l10n/gecko-strings"
|
||||
|
||||
PULL_AFTER = timedelta(days=2)
|
||||
|
||||
|
||||
def inspect_migration(path):
|
||||
"""Validate recipe and extract some metadata."""
|
||||
return validator.Validator.validate(path)
|
||||
return Validator.validate(path)
|
||||
|
||||
|
||||
def prepare_object_dir(cmd):
|
||||
"""Prepare object dir to have an up-to-date clone of gecko-strings.
|
||||
def prepare_directories(cmd, use_git=False):
|
||||
"""
|
||||
Ensure object dir exists,
|
||||
and that repo dir has a relatively up-to-date clone of l10n-source or gecko-strings.
|
||||
|
||||
We run this once per mach invocation, for all tested migrations.
|
||||
"""
|
||||
obj_dir = mozpath.join(cmd.topobjdir, "python", "l10n")
|
||||
obj_dir = join(cmd.topobjdir, "python", "l10n")
|
||||
if not os.path.exists(obj_dir):
|
||||
os.makedirs(obj_dir)
|
||||
state_dir = get_state_dir()
|
||||
if os.path.exists(mozpath.join(state_dir, "gecko-strings")):
|
||||
cmd.run_process(
|
||||
["hg", "pull", "-u"], cwd=mozpath.join(state_dir, "gecko-strings")
|
||||
)
|
||||
|
||||
if use_git:
|
||||
repo_dir = join(get_state_dir(), L10N_SOURCE_NAME)
|
||||
marker = join(repo_dir, ".git", "l10n_pull_marker")
|
||||
else:
|
||||
cmd.run_process(
|
||||
["hg", "clone", "https://hg.mozilla.org/l10n/gecko-strings"],
|
||||
cwd=state_dir,
|
||||
)
|
||||
return obj_dir
|
||||
repo_dir = join(get_state_dir(), STRINGS_NAME)
|
||||
marker = join(repo_dir, ".hg", "l10n_pull_marker")
|
||||
|
||||
try:
|
||||
last_pull = datetime.fromtimestamp(os.stat(marker).st_mtime)
|
||||
skip_clone = datetime.now() < last_pull + PULL_AFTER
|
||||
except OSError:
|
||||
skip_clone = False
|
||||
if not skip_clone:
|
||||
if use_git:
|
||||
update_git_repo(L10N_SOURCE_REPO, repo_dir)
|
||||
else:
|
||||
update_mercurial_repo(STRINGS_REPO, repo_dir)
|
||||
with open(marker, "w") as fh:
|
||||
fh.flush()
|
||||
|
||||
return obj_dir, repo_dir
|
||||
|
||||
|
||||
def diff_resources(left_path, right_path):
|
||||
|
|
@ -55,11 +80,18 @@ def diff_resources(left_path, right_path):
|
|||
)
|
||||
|
||||
|
||||
def test_migration(cmd, obj_dir, to_test, references):
|
||||
def test_migration(
|
||||
cmd,
|
||||
obj_dir: str,
|
||||
repo_dir: str,
|
||||
use_git: bool,
|
||||
to_test: list[str],
|
||||
references: Iterable[str],
|
||||
):
|
||||
"""Test the given recipe.
|
||||
|
||||
This creates a workdir by l10n-merging gecko-strings and the m-c source,
|
||||
to mimmic gecko-strings after the patch to test landed.
|
||||
to mimic gecko-strings after the patch to test landed.
|
||||
It then runs the recipe with a gecko-strings clone as localization, both
|
||||
dry and wet.
|
||||
It inspects the generated commits, and shows a diff between the merged
|
||||
|
|
@ -69,7 +101,7 @@ def test_migration(cmd, obj_dir, to_test, references):
|
|||
"""
|
||||
rv = 0
|
||||
migration_name = os.path.splitext(os.path.split(to_test)[1])[0]
|
||||
work_dir = mozpath.join(obj_dir, migration_name)
|
||||
work_dir = join(obj_dir, migration_name)
|
||||
|
||||
paths = os.path.normpath(to_test).split(os.sep)
|
||||
# Migration modules should be in a sub-folder of l10n.
|
||||
|
|
@ -79,32 +111,28 @@ def test_migration(cmd, obj_dir, to_test, references):
|
|||
|
||||
if os.path.exists(work_dir):
|
||||
shutil.rmtree(work_dir)
|
||||
os.makedirs(mozpath.join(work_dir, "reference"))
|
||||
l10n_toml = mozpath.join(
|
||||
cmd.topsrcdir, cmd.substs["MOZ_BUILD_APP"], "locales", "l10n.toml"
|
||||
)
|
||||
os.makedirs(join(work_dir, "reference"))
|
||||
l10n_toml = join(cmd.topsrcdir, cmd.substs["MOZ_BUILD_APP"], "locales", "l10n.toml")
|
||||
pc = TOMLParser().parse(l10n_toml, env={"l10n_base": work_dir})
|
||||
pc.set_locales(["reference"])
|
||||
files = ProjectFiles("reference", [pc])
|
||||
ref_root = join(work_dir, "reference")
|
||||
for ref in references:
|
||||
if ref != mozpath.normpath(ref):
|
||||
if ref != normpath(ref):
|
||||
cmd.log(
|
||||
logging.ERROR,
|
||||
"fluent-migration-test",
|
||||
{
|
||||
"file": to_test,
|
||||
"ref": ref,
|
||||
},
|
||||
{"file": to_test, "ref": ref},
|
||||
'Reference path "{ref}" needs to be normalized for {file}',
|
||||
)
|
||||
rv = 1
|
||||
continue
|
||||
full_ref = mozpath.join(work_dir, "reference", ref)
|
||||
full_ref = join(ref_root, ref)
|
||||
m = files.match(full_ref)
|
||||
if m is None:
|
||||
raise ValueError("Bad reference path: " + ref)
|
||||
m_c_path = m[1]
|
||||
g_s_path = mozpath.join(work_dir, "gecko-strings", ref)
|
||||
g_s_path = join(work_dir, L10N_SOURCE_NAME if use_git else STRINGS_NAME, ref)
|
||||
resources = [
|
||||
b"" if not os.path.exists(f) else open(f, "rb").read()
|
||||
for f in (g_s_path, m_c_path)
|
||||
|
|
@ -113,12 +141,13 @@ def test_migration(cmd, obj_dir, to_test, references):
|
|||
if not os.path.exists(ref_dir):
|
||||
os.makedirs(ref_dir)
|
||||
open(full_ref, "wb").write(merge_channels(ref, resources))
|
||||
client = hglib.clone(
|
||||
source=mozpath.join(get_state_dir(), "gecko-strings"),
|
||||
dest=mozpath.join(work_dir, "en-US"),
|
||||
)
|
||||
client.open()
|
||||
old_tip = client.tip().node
|
||||
l10n_root = join(work_dir, "en-US")
|
||||
if use_git:
|
||||
git(work_dir, "clone", repo_dir, l10n_root)
|
||||
else:
|
||||
hglib.clone(source=repo_dir, dest=l10n_root)
|
||||
client = RepoClient(l10n_root)
|
||||
old_tip = client.head()
|
||||
run_migration = [
|
||||
cmd._virtualenv_manager.python_path,
|
||||
"-m",
|
||||
|
|
@ -126,43 +155,28 @@ def test_migration(cmd, obj_dir, to_test, references):
|
|||
"--lang",
|
||||
"en-US",
|
||||
"--reference-dir",
|
||||
mozpath.join(work_dir, "reference"),
|
||||
ref_root,
|
||||
"--localization-dir",
|
||||
mozpath.join(work_dir, "en-US"),
|
||||
l10n_root,
|
||||
"--dry-run",
|
||||
migration_module,
|
||||
]
|
||||
cmd.run_process(
|
||||
run_migration,
|
||||
cwd=work_dir,
|
||||
line_handler=print,
|
||||
)
|
||||
cmd.run_process(run_migration, cwd=work_dir, line_handler=print)
|
||||
# drop --dry-run
|
||||
run_migration.pop(-2)
|
||||
cmd.run_process(
|
||||
run_migration,
|
||||
cwd=work_dir,
|
||||
line_handler=print,
|
||||
)
|
||||
tip = client.tip().node
|
||||
cmd.run_process(run_migration, cwd=work_dir, line_handler=print)
|
||||
tip = client.head()
|
||||
if old_tip == tip:
|
||||
cmd.log(
|
||||
logging.WARN,
|
||||
"fluent-migration-test",
|
||||
{
|
||||
"file": to_test,
|
||||
},
|
||||
{"file": to_test},
|
||||
"No migration applied for {file}",
|
||||
)
|
||||
return rv
|
||||
for ref in references:
|
||||
diff_resources(
|
||||
mozpath.join(work_dir, "reference", ref),
|
||||
mozpath.join(work_dir, "en-US", ref),
|
||||
)
|
||||
messages = [
|
||||
l.desc.decode("utf-8") for l in client.log(b"::%s - ::%s" % (tip, old_tip))
|
||||
]
|
||||
diff_resources(join(ref_root, ref), join(l10n_root, ref))
|
||||
messages = client.log(old_tip, tip)
|
||||
bug = re.search("[0-9]{5,}", migration_name)
|
||||
# Just check first message for bug number, they're all following the same pattern
|
||||
if bug is None or bug.group() not in messages[0]:
|
||||
|
|
@ -170,9 +184,7 @@ def test_migration(cmd, obj_dir, to_test, references):
|
|||
cmd.log(
|
||||
logging.ERROR,
|
||||
"fluent-migration-test",
|
||||
{
|
||||
"file": to_test,
|
||||
},
|
||||
{"file": to_test},
|
||||
"Missing or wrong bug number for {file}",
|
||||
)
|
||||
if any("part {}".format(n + 1) not in msg for n, msg in enumerate(messages)):
|
||||
|
|
@ -180,9 +192,7 @@ def test_migration(cmd, obj_dir, to_test, references):
|
|||
cmd.log(
|
||||
logging.ERROR,
|
||||
"fluent-migration-test",
|
||||
{
|
||||
"file": to_test,
|
||||
},
|
||||
{"file": to_test},
|
||||
'Commit messages should have "part {{index}}" for {file}',
|
||||
)
|
||||
return rv
|
||||
|
|
|
|||
|
|
@ -1184,8 +1184,14 @@ def run_rusttests(command_context, **kwargs):
|
|||
category="testing",
|
||||
description="Test Fluent migration recipes.",
|
||||
)
|
||||
@CommandArgument(
|
||||
"--l10n-git",
|
||||
action="store_true",
|
||||
dest="l10n_git",
|
||||
help="Use git rather than hg source repository",
|
||||
)
|
||||
@CommandArgument("test_paths", nargs="*", metavar="N", help="Recipe paths to test.")
|
||||
def run_migration_tests(command_context, test_paths=None, **kwargs):
|
||||
def run_migration_tests(command_context, l10n_git=False, test_paths=None, **kwargs):
|
||||
if not test_paths:
|
||||
test_paths = []
|
||||
command_context.activate_virtualenv()
|
||||
|
|
@ -1222,9 +1228,11 @@ def run_migration_tests(command_context, test_paths=None, **kwargs):
|
|||
"ERROR in {file}: {error}",
|
||||
)
|
||||
rv |= 1
|
||||
obj_dir = fmt.prepare_object_dir(command_context)
|
||||
obj_dir, repo_dir = fmt.prepare_directories(command_context, l10n_git)
|
||||
for context in with_context:
|
||||
rv |= fmt.test_migration(command_context, obj_dir, **context)
|
||||
rv |= fmt.test_migration(
|
||||
command_context, obj_dir, repo_dir, l10n_git, **context
|
||||
)
|
||||
return rv
|
||||
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче