Skip to content

Commit 003a4b5

Browse files
committed
switch is_root=False by default for the mock module function
1 parent 72230e4 commit 003a4b5

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

tests/python/python_tests.bzl

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def _mock_mctx(*modules, environ = {}, mocked_files = {}):
4444
)
4545

4646
# todo: change is_root to false by default. most modules aren't root
47-
def _mod(*, name, defaults = [], toolchain = [], override = [], single_version_override = [], single_version_platform_override = [], is_root = True):
47+
def _mod(*, name, defaults = [], toolchain = [], override = [], single_version_override = [], single_version_platform_override = [], is_root = False):
4848
return struct(
4949
name = name,
5050
tags = struct(
@@ -203,7 +203,7 @@ _tests.append(_test_default_from_rules_python_when_rules_python_is_not_root)
203203
def _test_default_with_patch_version(env):
204204
py = parse_modules(
205205
module_ctx = _mock_mctx(
206-
_mod(name = "alpha", toolchain = [_toolchain("3.11.2")]),
206+
_mod(name = "alpha", toolchain = [_toolchain("3.11.2")], is_root = True),
207207
_rules_python_module(is_root = True),
208208
),
209209
logger = repo_utils.logger(verbosity_level = 0, name = "python"),
@@ -226,6 +226,7 @@ def _test_default_non_rules_python_ignore_root_user_error(env):
226226
_mod(
227227
name = "my_module",
228228
toolchain = [_toolchain("3.12", ignore_root_user_error = False)],
229+
is_root = True,
229230
),
230231
_rules_python_module(),
231232
),
@@ -253,9 +254,10 @@ def _test_default_non_rules_python_ignore_root_user_error(env):
253254
_tests.append(_test_default_non_rules_python_ignore_root_user_error)
254255

255256
def _test_default_non_rules_python_ignore_root_user_error_non_root_module(env):
257+
"""Verify a non-root intermediate module has its ignore_root_user_error setting ignored."""
256258
py = parse_modules(
257259
module_ctx = _mock_mctx(
258-
_mod(name = "my_module", toolchain = [_toolchain("3.13")]),
260+
_mod(name = "my_module", is_root = True, toolchain = [_toolchain("3.13")]),
259261
_mod(name = "some_module", toolchain = [_toolchain("3.12", ignore_root_user_error = False)]),
260262
_rules_python_module(),
261263
),
@@ -302,6 +304,7 @@ def _test_toolchain_ordering(env):
302304
_toolchain("3.11.10"),
303305
_toolchain("3.11.13", is_default = True),
304306
],
307+
is_root = True,
305308
),
306309
_rules_python_module(),
307310
),
@@ -484,7 +487,7 @@ _tests.append(_test_defaults_overrides_toolchains_setting_is_default)
484487
def _test_first_occurance_of_the_toolchain_wins(env):
485488
py = parse_modules(
486489
module_ctx = _mock_mctx(
487-
_mod(name = "my_module", toolchain = [_toolchain("3.12")]),
490+
_mod(name = "my_module", is_root = True, toolchain = [_toolchain("3.12")]),
488491
_mod(name = "some_module", toolchain = [_toolchain("3.12", configure_coverage_tool = True)]),
489492
_rules_python_module(),
490493
environ = {
@@ -534,6 +537,7 @@ def _test_auth_overrides(env):
534537
auth_patterns = {"foo": "bar"},
535538
),
536539
],
540+
is_root = True,
537541
),
538542
_rules_python_module(),
539543
),
@@ -569,6 +573,7 @@ def _test_add_new_version(env):
569573
module_ctx = _mock_mctx(
570574
_mod(
571575
name = "my_module",
576+
is_root = True,
572577
toolchain = [_toolchain("3.13")],
573578
single_version_override = [
574579
_single_version_override(
@@ -649,6 +654,7 @@ def _test_register_all_versions(env):
649654
module_ctx = _mock_mctx(
650655
_mod(
651656
name = "my_module",
657+
is_root = True,
652658
toolchain = [_toolchain("3.13")],
653659
single_version_override = [
654660
_single_version_override(
@@ -714,6 +720,7 @@ def _test_add_patches(env):
714720
module_ctx = _mock_mctx(
715721
_mod(
716722
name = "my_module",
723+
is_root = True,
717724
toolchain = [_toolchain("3.13")],
718725
single_version_override = [
719726
_single_version_override(
@@ -792,6 +799,7 @@ def _test_fail_two_overrides(env):
792799
module_ctx = _mock_mctx(
793800
_mod(
794801
name = "my_module",
802+
is_root = True,
795803
toolchain = [_toolchain("3.13")],
796804
override = [
797805
_override(base_url = "foo"),
@@ -823,6 +831,7 @@ def _test_single_version_override_errors(env):
823831
module_ctx = _mock_mctx(
824832
_mod(
825833
name = "my_module",
834+
is_root = True,
826835
toolchain = [_toolchain("3.13")],
827836
single_version_override = test.overrides,
828837
),
@@ -863,6 +872,7 @@ def _test_single_version_platform_override_errors(env):
863872
name = "my_module",
864873
toolchain = [_toolchain("3.13")],
865874
single_version_platform_override = test.overrides,
875+
is_root = True,
866876
),
867877
),
868878
_fail = lambda *a: errors.append(" ".join(a)),

0 commit comments

Comments
 (0)