mirror of
https://gerrit.googlesource.com/git-repo
synced 2026-09-26 16:50:37 +00:00
Victor Pushkarev
16cfb53e0a
The update-manpages wrapper calls update_manpages.main() unconditionally. With spawn and forkserver, multiprocessing re-executes the directly run main script as __mp_main__. The wrapper then calls main() again and tries to create another Pool while the child is still starting. Protect the entrypoint with __main__ guard. On Linux, this was mostly hidden while fork was the default start method; Python 3.14 now defaults to forkserver there. Normal command-line behavior is unchanged. Add a regression test that mirrors multiprocessing's __mp_main__ execution path and checks that it does not call update_manpages.main(). Change-Id: I28fdb18ccf2e4d61605cc072b4de52b6eb561335 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/626841 Tested-by: Victor Pushkarev <corvinus.v@gmail.com> Commit-Queue: Victor Pushkarev <corvinus.v@gmail.com> Reviewed-by: Mike Frysinger <vapier@google.com> Reviewed-by: Gavin Mak <gavinmak@google.com>
44 lines
1.3 KiB
Python
44 lines
1.3 KiB
Python
# Copyright (C) 2026 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""Tests for the release/update-manpages wrapper."""
|
|
|
|
import runpy
|
|
import sys
|
|
from types import ModuleType
|
|
|
|
import pytest
|
|
import utils_for_test
|
|
|
|
|
|
UPDATE_MANPAGES_SCRIPT = (
|
|
utils_for_test.THIS_DIR.parent / "release" / "update-manpages"
|
|
)
|
|
|
|
|
|
def test_wrapper_does_not_run_main_for_multiprocessing_child(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
"""Do not rerun main when multiprocessing re-executes the wrapper."""
|
|
fake_update_manpages = ModuleType("update_manpages")
|
|
|
|
# Mock this because the real module requires newer Python versions than
|
|
# our unittest framework does.
|
|
monkeypatch.setitem(sys.modules, "update_manpages", fake_update_manpages)
|
|
|
|
runpy.run_path(
|
|
str(UPDATE_MANPAGES_SCRIPT),
|
|
run_name="__mp_main__",
|
|
)
|