Skip to content

Commit dbec81e

Browse files
Flatten nested mocks in base_dir override tests
1 parent ee9e90f commit dbec81e

1 file changed

Lines changed: 23 additions & 19 deletions

File tree

tests/test_export_base_dir_override.py

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,21 @@ def test_main_passes_base_dir_as_resolve_override(self):
2424
"exclusion_rules_path": None,
2525
"base_dir": "/custom/workspace",
2626
}
27-
with patch.object(export_script, "parse_args", return_value=opts):
28-
with patch.object(
27+
with (
28+
patch.object(export_script, "parse_args", return_value=opts),
29+
patch.object(
2930
export_script,
3031
"collect_export_entries",
3132
return_value=[],
32-
) as mock_collect:
33-
with patch.object(
34-
export_script,
35-
"resolve_workspace_path",
36-
return_value="/resolved/workspace",
37-
) as mock_resolve:
38-
with self.assertRaises(SystemExit) as ctx:
39-
export_script.main()
33+
) as mock_collect,
34+
patch.object(
35+
export_script,
36+
"resolve_workspace_path",
37+
return_value="/resolved/workspace",
38+
) as mock_resolve,
39+
self.assertRaises(SystemExit) as ctx,
40+
):
41+
export_script.main()
4042
self.assertEqual(ctx.exception.code, 0)
4143
mock_resolve.assert_called_once_with(override="/custom/workspace")
4244
mock_collect.assert_called_once()
@@ -58,15 +60,17 @@ def test_base_dir_does_not_mutate_workspace_path_env(self):
5860
prior = os.environ.get("WORKSPACE_PATH")
5961
os.environ["WORKSPACE_PATH"] = sentinel
6062
try:
61-
with patch.object(export_script, "parse_args", return_value=opts):
62-
with patch.object(export_script, "collect_export_entries", return_value=[]):
63-
with patch.object(
64-
export_script,
65-
"resolve_workspace_path",
66-
return_value="/resolved/workspace",
67-
):
68-
with self.assertRaises(SystemExit):
69-
export_script.main()
63+
with (
64+
patch.object(export_script, "parse_args", return_value=opts),
65+
patch.object(export_script, "collect_export_entries", return_value=[]),
66+
patch.object(
67+
export_script,
68+
"resolve_workspace_path",
69+
return_value="/resolved/workspace",
70+
),
71+
self.assertRaises(SystemExit),
72+
):
73+
export_script.main()
7074
self.assertEqual(os.environ.get("WORKSPACE_PATH"), sentinel)
7175
finally:
7276
if prior is None:

0 commit comments

Comments
 (0)