Formatting

tests/test_cli.py

@@ -59,7 +59,6 @@ class upload_packages_test(unittest.TestCase):
       },
     }
     return modulus.cli.build_context(repo_root or pathlib.Path(os.getcwd()), config)
-
   def test_cli_import_does_not_import_conan_recipe_module(self):
     repo = pathlib.Path(__file__).resolve().parents[1]
     command = [
@@ -69,7 +68,6 @@ class upload_packages_test(unittest.TestCase):
     ]
     completed = subprocess.run(command, cwd=repo, check=False)
     self.assertEqual(completed.returncode, 0)
-
   def test_project_root_build_is_rejected(self):
     with tempfile.TemporaryDirectory() as directory:
       root = pathlib.Path(directory)
@@ -77,7 +75,6 @@ class upload_packages_test(unittest.TestCase):
       context.config["tooling"]["targets"]["native"]["build_dir"] = "."
       with self.assertRaisesRegex(modulus.config.config_error, "project and source roots"):
         modulus.cli.build_context(root, context.config)
-
   def test_configure_and_lsp_refresh_project_editor_settings(self):
     with tempfile.TemporaryDirectory() as directory:
       root = pathlib.Path(directory)
@@ -97,7 +94,6 @@ class upload_packages_test(unittest.TestCase):
             before = {name: (root / name).stat().st_mtime_ns for name in modulus.export.editor_files.values()}
             self.assertEqual(modulus.cli.main(command), 0)
             self.assertEqual(before, {name: (root / name).stat().st_mtime_ns for name in before})
-
   def test_lsp_rejects_source_root_before_cache_cleanup(self):
     with tempfile.TemporaryDirectory() as directory:
       root = pathlib.Path(directory)
@@ -112,7 +108,6 @@ class upload_packages_test(unittest.TestCase):
             modulus.cli.configure_lsp_database(context, {"source_dir": "subproject", "build_dir": build_dir})
         clear.assert_not_called()
       self.assertEqual(cache.read_text(encoding="utf-8"), "keep")
-
   @unittest.mock.patch.object(modulus.cli, "upload_all_packages", return_value=37)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
   def test_failed_upload_does_not_force_by_default(self, configure, upload):
@@ -122,7 +117,6 @@ class upload_packages_test(unittest.TestCase):
     self.assertEqual(status, 37)
     configure.assert_called_once_with(context, authenticate=True)
     upload.assert_called_once_with(context, "origin", force=False)
-
   @unittest.mock.patch.object(modulus.cli, "upload_all_packages")
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote")
   def test_replace_requires_guard_env(self, configure, upload):
@@ -131,7 +125,6 @@ class upload_packages_test(unittest.TestCase):
     self.assertEqual(status, 1)
     configure.assert_not_called()
     upload.assert_not_called()
-
   @unittest.mock.patch.object(modulus.cli, "upload_all_packages", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
   def test_replace_forces_upload_when_guarded(self, configure, upload):
@@ -147,7 +140,6 @@ class upload_packages_test(unittest.TestCase):
     self.assertEqual(status, 0)
     configure.assert_called_once_with(context, authenticate=True)
     upload.assert_called_once_with(context, "origin", force=True)
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_upload_defaults_to_latest_reference(self, run):
     with unittest.mock.patch.dict(os.environ, {}, clear=True):
@@ -155,13 +147,11 @@ class upload_packages_test(unittest.TestCase):
     self.assertEqual(status, 0)
     self.assertIn("sample/latest:*", run.call_args.args[1])
     self.assertNotIn("--force", run.call_args.args[1])
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_replace_upload_uses_conan_force(self, run):
     status = modulus.cli.upload_all_packages(self.context(), "origin", force=True)
     self.assertEqual(status, 0)
     self.assertIn("--force", run.call_args.args[1])
-
   def test_checked_in_ci_overwrites_latest_on_master(self):
     workflow = (pathlib.Path(__file__).resolve().parents[1] / ".gitea" / "workflows" / "ci.yml").read_text(encoding="utf-8")
     self.assertIn("gitea.ref == 'refs/heads/master'", workflow)
@@ -178,7 +168,6 @@ class upload_packages_test(unittest.TestCase):
     self.assertNotIn("--volume \"${PWD}:${PWD}\"", workflow)
     self.assertNotIn("CONAN_PUBLIC_REMOTE_URL", workflow)
     self.assertNotIn("docs.py", workflow)
-
   def test_removed_public_commands_are_rejected(self):
     with tempfile.TemporaryDirectory() as repo_dir:
       repo = pathlib.Path(repo_dir)
@@ -194,7 +183,6 @@ class upload_packages_test(unittest.TestCase):
             modulus.cli.main(command)
       finally:
         os.chdir(previous_cwd)
-
   def test_docker_passthrough_includes_replace_env(self):
     passthrough = modulus.cli.docker_passthrough_env(self.context())
     self.assertIn("MODULUS_ALLOW_PACKAGE_REPLACE", passthrough)
@@ -205,7 +193,6 @@ class upload_packages_test(unittest.TestCase):
     self.assertNotIn("MODULUS_EXPORT_RUNTIME", passthrough)
     self.assertNotIn("GITHUB_TOKEN", passthrough)
     self.assertNotIn("GITEA_TOKEN", passthrough)
-
   def test_run_ports_default_to_empty_list(self):
     config = modulus.config.normalize({
       "package": {
@@ -213,7 +200,6 @@ class upload_packages_test(unittest.TestCase):
       },
     })
     self.assertEqual(config["tooling"]["run"]["ports"], [])
-
   def test_run_accepts_docker_publish_mapping(self):
     config = modulus.config.normalize({
       "package": {
@@ -226,7 +212,6 @@ class upload_packages_test(unittest.TestCase):
       },
     })
     self.assertEqual(config["tooling"]["run"]["ports"], ["127.0.0.1:8000:8000/tcp"])
-
   def test_run_rejects_invalid_docker_publish_mapping(self):
     with self.assertRaisesRegex(modulus.config.config_error, "tooling.run.ports\\[0\\]"):
       modulus.config.normalize({
@@ -239,13 +224,11 @@ class upload_packages_test(unittest.TestCase):
           },
         },
       })
-
   @unittest.mock.patch.object(modulus.cli, "in_docker", return_value=True)
   def test_run_is_disabled_by_default(self, docker):
     status = modulus.cli.product_run(self.context(), [])
     self.assertEqual(status, 1)
     docker.assert_not_called()
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "in_docker", return_value=True)
   def test_run_executes_configured_product_executable(self, docker, run):
@@ -284,7 +267,6 @@ class upload_packages_test(unittest.TestCase):
     )
     self.assertEqual(run.call_args.kwargs["env_overrides"], {"SAMPLE_WEB_ROOT": "build/web"})
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "docker_run", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "in_docker", return_value=False)
   def test_run_publishes_configured_ports_when_wrapped_by_docker(self, docker, docker_run):
@@ -308,7 +290,6 @@ class upload_packages_test(unittest.TestCase):
       ],
     )
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_build_image_honors_docker_platform_env(self, run):
     context = self.context()
@@ -334,10 +315,11 @@ class upload_packages_test(unittest.TestCase):
         "sample-build:dev",
         "--label",
         f"{modulus.cli.modulus.clangd.image_label}={modulus.cli.modulus.clangd.recipe_digest(context)}",
+        "--build-arg",
+        "MODULUS_TOOLS=tools",
         ".",
       ],
     )
-
   @unittest.mock.patch.object(modulus.cli, "ensure_build_image", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "in_container", return_value=False)
@@ -356,11 +338,9 @@ class upload_packages_test(unittest.TestCase):
     self.assertIn("linux/arm64", run.call_args.args[1])
     ensure_image.assert_called_once_with(context)
     in_container.assert_called_once()
-
   def test_conan_remote_url_uses_config_by_default(self):
     with unittest.mock.patch.dict(os.environ, {}, clear=True):
       self.assertEqual(modulus.cli.conan_remote_url(self.context()), "https://example.test/conan")
-
   def test_conan_remote_url_uses_config_in_ci(self):
     with unittest.mock.patch.dict(
       os.environ,
@@ -370,7 +350,6 @@ class upload_packages_test(unittest.TestCase):
       clear=True,
     ):
       self.assertEqual(modulus.cli.conan_remote_url(self.context()), "https://example.test/conan")
-
   def test_conan_credentials_only_uses_conan_environment(self):
     with unittest.mock.patch.dict(
       os.environ,
@@ -384,7 +363,6 @@ class upload_packages_test(unittest.TestCase):
       user, token = modulus.cli.conan_credentials()
     self.assertEqual(user, "dev")
     self.assertEqual(token, "secret")
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_configure_remote_skips_login_without_conan_credentials(self, run):
     with unittest.mock.patch.dict(os.environ, {}, clear=True):
@@ -402,14 +380,12 @@ class upload_packages_test(unittest.TestCase):
         "https://example.test/conan",
       ],
     )
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_configure_remote_rejects_partial_conan_credentials(self, run):
     with unittest.mock.patch.dict(os.environ, {"CONAN_USER": "dev"}, clear=True):
       status = modulus.cli.configure_conan_remote(self.context())
     self.assertEqual(status, 1)
     run.assert_not_called()
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_configure_remote_skips_login_until_authentication_is_requested(self, run):
     context = self.context()
@@ -435,7 +411,6 @@ class upload_packages_test(unittest.TestCase):
         "https://example.test/conan",
       ],
     )
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_configure_remote_logs_in_with_hidden_token_when_authenticating(self, run):
     context = self.context()
@@ -484,7 +459,6 @@ class upload_packages_test(unittest.TestCase):
         "<hidden>",
       ],
     )
-
   def multi_target_context(self):
     config = {
       "package": {
@@ -537,7 +511,6 @@ class upload_packages_test(unittest.TestCase):
       },
     }
     return modulus.cli.build_context(pathlib.Path(os.getcwd()), config)
-
   def test_selected_targets_default_to_default_target_only(self):
     context = self.multi_target_context()
     selected = context.selected_targets(
@@ -545,7 +518,6 @@ class upload_packages_test(unittest.TestCase):
       False,
     )
     self.assertEqual([target.name for target in selected], ["debug"])
-
   def test_selected_targets_all_returns_every_target(self):
     context = self.multi_target_context()
     selected = context.selected_targets(
@@ -553,7 +525,6 @@ class upload_packages_test(unittest.TestCase):
       True,
     )
     self.assertEqual([target.name for target in selected], ["debug", "release"])
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "in_docker", return_value=True)
   def test_build_can_target_one_cmake_target(self, docker, run):
@@ -586,7 +557,6 @@ class upload_packages_test(unittest.TestCase):
       ],
     )
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_one", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
@@ -609,7 +579,6 @@ class upload_packages_test(unittest.TestCase):
       ],
     )
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_one", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
@@ -635,7 +604,6 @@ class upload_packages_test(unittest.TestCase):
       ],
     )
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_one", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
@@ -664,7 +632,6 @@ class upload_packages_test(unittest.TestCase):
       ],
     )
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_one", return_value=37)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
@@ -678,7 +645,6 @@ class upload_packages_test(unittest.TestCase):
     configure_one.assert_called_once_with(context, context.default_target, update=False)
     run.assert_not_called()
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "configure_one", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "in_docker", return_value=True)
@@ -697,7 +663,6 @@ class upload_packages_test(unittest.TestCase):
     configure_remote.assert_not_called()
     configure_one.assert_called_once_with(context, context.default_target, False, no_remote=True)
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "upload_packages", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "create_package", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
@@ -724,7 +689,6 @@ class upload_packages_test(unittest.TestCase):
     create_package.assert_called_once_with(context, context.default_target, False, no_remote=True)
     upload.assert_not_called()
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "upload_packages", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "create_package", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
@@ -752,7 +716,6 @@ class upload_packages_test(unittest.TestCase):
     create_package.assert_called_once_with(context, context.default_target, False, no_remote=False)
     upload.assert_called_once_with(context, replace=False)
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "upload_packages", return_value=1)
   @unittest.mock.patch.object(modulus.cli, "create_package", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
@@ -778,7 +741,6 @@ class upload_packages_test(unittest.TestCase):
     create_package.assert_called_once_with(context, context.default_target, False, no_remote=False)
     upload.assert_called_once_with(context, replace=False)
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "create_package", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "in_docker", return_value=True)
@@ -803,7 +765,6 @@ class upload_packages_test(unittest.TestCase):
     create_package.assert_not_called()
     run.assert_not_called()
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "clear_conan_deps")
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_configure_one_passes_no_remote_to_conan_install(self, run, clear):
@@ -819,7 +780,6 @@ class upload_packages_test(unittest.TestCase):
     self.assertIn(f"-DCMAKE_TOOLCHAIN_FILE={context.default_target.build_dir / 'conan' / 'conan_toolchain.cmake'}", run.call_args_list[1].args[1])
     self.assertIn("-DCMAKE_BUILD_TYPE=Release", run.call_args_list[1].args[1])
     clear.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "clear_conan_deps")
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_configure_one_passes_target_cmake_definitions(self, run, clear):
@@ -836,7 +796,6 @@ class upload_packages_test(unittest.TestCase):
     self.assertIn("-DSAMPLE_MODE=dev", cmake_command)
     self.assertIn("-DSAMPLE_LIMIT=2", cmake_command)
     clear.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "configure_lsp_database", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_one", return_value=0)
   @unittest.mock.patch.object(modulus.cli, "configure_conan_remote", return_value=0)
@@ -864,7 +823,6 @@ class upload_packages_test(unittest.TestCase):
     configure_one.assert_called_once_with(context, context.default_target, False, no_remote=False)
     configure_lsp.assert_called_once_with(context, database)
     docker.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_configure_lsp_database_passes_cmake_definitions_and_unsets_env(self, run):
     with tempfile.TemporaryDirectory() as repo_dir:
@@ -891,7 +849,6 @@ class upload_packages_test(unittest.TestCase):
     self.assertIn("-DVAMP_PICO_FIRMWARE_PROJECT=ON", command)
     self.assertEqual(run.call_args.kwargs["env_overrides"], {"PICO_SDK_PATH": "/opt/pico-sdk"})
     self.assertEqual(run.call_args.kwargs["env_unset"], ["CC", "CXX"])
-
   @unittest.mock.patch.object(modulus.cli, "clear_conan_deps")
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_configure_one_allows_public_repos_to_build_missing_dependencies(self, run, clear):
@@ -901,7 +858,6 @@ class upload_packages_test(unittest.TestCase):
     conan_command = run.call_args_list[0].args[1]
     self.assertIn("--build=missing", conan_command)
     clear.assert_called_once()
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_create_package_passes_no_remote_to_conan_create(self, run):
     with tempfile.TemporaryDirectory() as repo_dir:
@@ -912,7 +868,6 @@ class upload_packages_test(unittest.TestCase):
     self.assertIn("--build=sample/*", run.call_args.args[1])
     self.assertIn("--build=missing", run.call_args.args[1])
     self.assertIn("--no-remote", run.call_args.args[1])
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_create_package_allows_public_repos_to_build_missing_dependencies(self, run):
     with tempfile.TemporaryDirectory() as repo_dir:
@@ -921,7 +876,6 @@ class upload_packages_test(unittest.TestCase):
     self.assertEqual(status, 0)
     self.assertIn("--build=sample/*", run.call_args.args[1])
     self.assertIn("--build=missing", run.call_args.args[1])
-
   def test_create_artifact_package_installs_archives_and_checksums_tree(self):
     with tempfile.TemporaryDirectory() as repo_dir:
       repo = pathlib.Path(repo_dir)
@@ -937,14 +891,12 @@ class upload_packages_test(unittest.TestCase):
           "with_appliance_adapters": True,
         },
       })
-
       def fake_run(run_context, command, **kwargs):
         if command[:2] == ["cmake", "--install"]:
           install_root = modulus.cli.package_artifact_build_root(context, context.default_target) / "stage" / "usr"
           (install_root / "bin").mkdir(parents=True)
           (install_root / "bin" / "sample").write_text("binary\n", encoding="utf-8")
         return 0
-
       with unittest.mock.patch.object(modulus.cli, "run", side_effect=fake_run) as run:
         status, artifacts = modulus.cli.create_artifact_package(
           context,
@@ -971,7 +923,6 @@ class upload_packages_test(unittest.TestCase):
       cmake_command = run.call_args_list[1].args[1]
       self.assertIn("-DSAMPLE_WITH_WEB=ON", cmake_command)
       self.assertIn(f"-DCMAKE_INSTALL_PREFIX={repo / 'build' / 'build_common' / 'artifacts' / 'native' / 'stage' / 'usr'}", cmake_command)
-
   @unittest.mock.patch.object(modulus.cli, "run", return_value=0)
   def test_generic_artifact_upload_uses_package_registry_credentials(self, run):
     context = self.context()