refact: ruff fixes

sfermigier · sfermigier · commit bd2d7d9f958d · 2026-03-06T11:55:47.000+01:00
diff --git a/packages/hop3-cli/tests/test_local_commands.py b/packages/hop3-cli/tests/test_local_commands.py
@@ -199,7 +199,7 @@ def mock_printer(self):
 
     def test_init_help(self, temp_config, mock_printer, capsys):
         """Test init --help shows help."""
-        result = handle_init(["--help"], temp_config, mock_printer)
+        handle_init(["--help"], temp_config, mock_printer)
 
         captured = capsys.readouterr()
         assert "Usage: hop3 init --ssh" in captured.out
@@ -233,7 +233,7 @@ def test_init_success(self, temp_config, mock_printer, capsys):
             ),
             patch("builtins.input", side_effect=["admin", "admin@example.com", ""]),
         ):
-            result = handle_init(
+            handle_init(
                 ["--ssh", "root@test.com", "-y"],
                 temp_config,
                 mock_printer,
@@ -263,7 +263,7 @@ def mock_printer(self):
 
     def test_login_help(self, temp_config, mock_printer, capsys):
         """Test login --help shows help."""
-        result = handle_login(["--help"], temp_config, mock_printer)
+        handle_login(["--help"], temp_config, mock_printer)
 
         captured = capsys.readouterr()
         assert "Usage: hop3 login" in captured.out
@@ -287,7 +287,7 @@ def test_login_ssh_success(self, temp_config, mock_printer, capsys):
             ),
             patch("builtins.input", return_value="testuser"),  # username
         ):
-            result = handle_login(
+            handle_login(
                 ["--ssh", "root@test.com"],
                 temp_config,
                 mock_printer,
@@ -313,7 +313,7 @@ def test_login_token_success(self, temp_config, mock_printer, capsys):
         with patch(
             "hop3_cli.commands.local.login_cmd._verify_token", return_value="testuser"
         ):
-            result = handle_login_token(
+            handle_login_token(
                 ["--token", mock_token, "--server", "http://localhost:8000"],
                 temp_config,
                 mock_printer,
@@ -338,7 +338,7 @@ def test_login_token_with_existing_server(self, temp_config, mock_printer, capsy
         with patch(
             "hop3_cli.commands.local.login_cmd._verify_token", return_value="testuser"
         ):
-            result = handle_login_token(
+            handle_login_token(
                 ["--token", mock_token],
                 temp_config,
                 mock_printer,
@@ -386,7 +386,7 @@ def test_login_url_with_token(self, temp_config, mock_printer, capsys):
         with patch(
             "hop3_cli.commands.local.login_cmd._verify_token", return_value="testuser"
         ):
-            result = handle_login([url_with_token], temp_config, mock_printer)
+            handle_login([url_with_token], temp_config, mock_printer)
 
         # Credentials are saved to a "default" context when no context exists
         default_ctx = temp_config.data["contexts"]["default"]
@@ -403,7 +403,7 @@ def test_login_url_with_token_and_path(self, temp_config, mock_printer, capsys):
         with patch(
             "hop3_cli.commands.local.login_cmd._verify_token", return_value="testuser"
         ):
-            result = handle_login([url_with_token], temp_config, mock_printer)
+            handle_login([url_with_token], temp_config, mock_printer)
 
         # Credentials are saved to a "default" context when no context exists
         default_ctx = temp_config.data["contexts"]["default"]
@@ -429,7 +429,7 @@ def mock_printer(self):
 
     def test_version_shows_cli_version(self, temp_config, mock_printer, capsys):
         """Test version command shows CLI version."""
-        result = handle_version([], temp_config, mock_printer)
+        handle_version([], temp_config, mock_printer)
 
         captured = capsys.readouterr()
         assert "hop3-cli" in captured.out
@@ -453,7 +453,7 @@ def mock_printer(self):
 
     def test_auth_shows_help(self, temp_config, mock_printer, capsys):
         """Test auth command shows authentication help."""
-        result = handle_auth([], temp_config, mock_printer)
+        handle_auth([], temp_config, mock_printer)
 
         captured = capsys.readouterr()
         assert "Authentication commands" in captured.out
@@ -462,7 +462,7 @@ def test_auth_shows_help(self, temp_config, mock_printer, capsys):
 
     def test_auth_with_help_flag(self, temp_config, mock_printer, capsys):
         """Test auth --help shows help."""
-        result = handle_auth(["--help"], temp_config, mock_printer)
+        handle_auth(["--help"], temp_config, mock_printer)
 
         captured = capsys.readouterr()
         assert "Authentication commands" in captured.out
diff --git a/packages/hop3-cli/tests/test_rich_printer.py b/packages/hop3-cli/tests/test_rich_printer.py
@@ -261,7 +261,7 @@ def test_rich_printer_unknown_message_type():
         printer.print([{"t": "unknown", "data": "something"}])
 
     # Should produce some output or handle gracefully
-    output = stdout_capture.getvalue()
+    stdout_capture.getvalue()
     # Unknown types might be printed as-is or ignored
     # Implementation-specific behavior
 
diff --git a/packages/hop3-server/tests/a_unit/cli/test_admin_cli.py b/packages/hop3-server/tests/a_unit/cli/test_admin_cli.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2025, Abilian SAS
 #
 # SPDX-License-Identifier: Apache-2.0
-# ruff: noqa: PT012
 
 """Tests for server-side CLI admin commands (hop3-server admin:*)."""
 
@@ -139,7 +138,7 @@ def test_create_admin_username_exists(self, mock_user, monkeypatch):
             ),
             pytest.raises(SystemExit) as exc_info,
         ):
-            cmd = AdminCreate()  # noqa: PT012
+            cmd = AdminCreate()
             cmd.run(username="testuser", email="new@example.com", password_stdin=False)
 
         assert exc_info.value.code == 1
@@ -160,7 +159,7 @@ def test_create_admin_password_mismatch(self, monkeypatch):
             ),
             pytest.raises(SystemExit) as exc_info,
         ):
-            cmd = AdminCreate()  # noqa: PT012
+            cmd = AdminCreate()
             cmd.run(
                 username="newadmin", email="admin@example.com", password_stdin=False
             )
@@ -208,7 +207,7 @@ def test_generate_token_user_not_found(self, monkeypatch):
             patch("hop3.server.cli.admin.get_session", return_value=mock_session),
             pytest.raises(SystemExit) as exc_info,
         ):
-            cmd = AdminToken()  # noqa: PT012
+            cmd = AdminToken()
             cmd.run(username="nonexistent")
 
         assert exc_info.value.code == 1
@@ -229,7 +228,7 @@ def test_generate_token_disabled_user(self, mock_user, monkeypatch):
             patch("hop3.server.cli.admin.get_session", return_value=mock_session),
             pytest.raises(SystemExit) as exc_info,
         ):
-            cmd = AdminToken()  # noqa: PT012
+            cmd = AdminToken()
             cmd.run(username="testuser")
 
         assert exc_info.value.code == 1
@@ -357,7 +356,7 @@ def test_reset_password_user_not_found(self, monkeypatch):
             ),
             pytest.raises(SystemExit) as exc_info,
         ):
-            cmd = AdminResetPassword()  # noqa: PT012
+            cmd = AdminResetPassword()
             cmd.run(username="nonexistent", password_stdin=False)
 
         assert exc_info.value.code == 1
diff --git a/packages/hop3-server/tests/a_unit/commands/test_config_migrate.py b/packages/hop3-server/tests/a_unit/commands/test_config_migrate.py
@@ -187,7 +187,7 @@ def test_migrate_procfile_with_backup(tmp_path):
     procfile_path.write_text(procfile_content)
 
     cmd = MigrateCmd()
-    result = cmd.call("procfile", str(tmp_path), dry_run=False, backup=True)
+    cmd.call("procfile", str(tmp_path), dry_run=False, backup=True)
 
     # Check backup was created
     backup = tmp_path / "Procfile.bak"
@@ -208,7 +208,7 @@ def test_migrate_procfile_no_backup(tmp_path):
     procfile_path.write_text(procfile_content)
 
     cmd = MigrateCmd()
-    result = cmd.call("procfile", str(tmp_path), dry_run=False, backup=False)
+    cmd.call("procfile", str(tmp_path), dry_run=False, backup=False)
 
     # Backup should not exist
     backup = tmp_path / "Procfile.bak"
@@ -279,7 +279,7 @@ def test_migrate_procfile_hop3_subdirectory(tmp_path):
     procfile_path.write_text("web: python app.py")
 
     cmd = MigrateCmd()
-    result = cmd.call("procfile", str(tmp_path), dry_run=False, backup=False)
+    cmd.call("procfile", str(tmp_path), dry_run=False, backup=False)
 
     # Should find and convert the Procfile in src/hop3/
     hop3_toml = hop3_dir / "hop3.toml"
diff --git a/packages/hop3-server/tests/a_unit/commands/test_config_set_unset.py b/packages/hop3-server/tests/a_unit/commands/test_config_set_unset.py
@@ -74,9 +74,7 @@ def test_config_set_multiple_variables(db_session: Session, test_app: App):
 def test_config_set_value_with_equals(db_session: Session, test_app: App):
     """Test setting a variable with an equals sign in the value."""
     cmd = SetCmd(db_session=db_session)
-    result = cmd.call(
-        "testapp", "DATABASE_URL=postgres://user:pass@host/db?param=value"
-    )
+    cmd.call("testapp", "DATABASE_URL=postgres://user:pass@host/db?param=value")
 
     # Verify it was saved with the full value including the equals sign
     app_repo = AppRepository(session=db_session)
@@ -88,7 +86,7 @@ def test_config_set_value_with_equals(db_session: Session, test_app: App):
 def test_config_set_empty_value(db_session: Session, test_app: App):
     """Test setting a variable to an empty value."""
     cmd = SetCmd(db_session=db_session)
-    result = cmd.call("testapp", "EMPTY_VAR=")
+    cmd.call("testapp", "EMPTY_VAR=")
 
     # Verify it was saved with empty string value
     app_repo = AppRepository(session=db_session)
diff --git a/packages/hop3-server/tests/a_unit/config/test_config.py b/packages/hop3-server/tests/a_unit/config/test_config.py
@@ -5,6 +5,7 @@
 
 from pathlib import Path
 
+from hop3.config import HopConfig
 from hop3.lib.config import Config
 
 
@@ -20,8 +21,6 @@ def test_default(monkeypatch):
     Note: This test ensures HOP3_ROOT is set to the expected test default
     regardless of environment variables.
     """
-    from hop3.config import HopConfig  # noqa: PLC0415
-
     # Ensure HOP3_ROOT environment variable is set to test default
     monkeypatch.setenv("HOP3_ROOT", "/tmp/hop3")
 
diff --git a/packages/hop3-server/tests/a_unit/plugins/docker/test_docker_deployer.py b/packages/hop3-server/tests/a_unit/plugins/docker/test_docker_deployer.py
@@ -132,9 +132,7 @@ def test_deploy_success(self, tmp_path: Path, docker_artifact: BuildArtifact):
 
         with (
             patch("subprocess.run") as mock_run,
-            patch(
-                "hop3.plugins.docker.deployer.get_free_port", return_value=9999
-            ) as mock_port,
+            patch("hop3.plugins.docker.deployer.get_free_port", return_value=9999),
         ):
             mock_run.return_value = MagicMock(returncode=0, stdout="", stderr="")
 
diff --git a/packages/hop3-server/tests/b_integration/commands/test_services_commands_integration.py b/packages/hop3-server/tests/b_integration/commands/test_services_commands_integration.py
@@ -407,7 +407,7 @@ def test_attach_with_custom_service_type(self, db_session: Session, test_app: Ap
 
             cmd = AddonsAttachCmd(db_session=db_session)
 
-            result = cmd.call("my-cache", "--app", "test-app", "--type", "redis")
+            cmd.call("my-cache", "--app", "test-app", "--type", "redis")
 
         mock_get_addon.assert_called_once_with("redis", "my-cache")
 
@@ -666,7 +666,7 @@ def test_detach_only_removes_specified_addon(
 
         cmd = AddonsDetachCmd(db_session=db_session)
 
-        result = cmd.call("my-db", "--app", "test-app", "--type", "postgres")
+        cmd.call("my-db", "--app", "test-app", "--type", "postgres")
 
         db_session.expire_all()
 
@@ -971,7 +971,7 @@ def test_info_with_default_service_type(self, db_session: Session):
 
             cmd = AddonsInfoCmd(db_session=db_session)
 
-            result = cmd.call("default-db")
+            cmd.call("default-db")
 
         # Should default to postgres
         mock_get_addon.assert_called_once_with("postgres", "default-db")
diff --git a/packages/hop3-server/tests/b_integration/test_backup_commands.py b/packages/hop3-server/tests/b_integration/test_backup_commands.py
@@ -125,7 +125,7 @@ def test_create_backup_includes_env_vars(self, test_db, test_app):
         """Test that backup includes environment variables."""
         cmd = BackupCreateCmd(db_session=test_db)
 
-        result = cmd.call("test-app", "--no-addons")
+        cmd.call("test-app", "--no-addons")
 
         # Find the backup directory
         backup_dir = HopConfig.get_instance().BACKUP_ROOT / "apps" / "test-app"
@@ -146,7 +146,7 @@ def test_create_backup_includes_source(self, test_db, test_app):
         """Test that backup includes source code."""
         cmd = BackupCreateCmd(db_session=test_db)
 
-        result = cmd.call("test-app", "--no-addons")
+        cmd.call("test-app", "--no-addons")
 
         # Find the backup directory
         backup_dir = HopConfig.get_instance().BACKUP_ROOT / "apps" / "test-app"
@@ -165,7 +165,7 @@ def test_create_backup_includes_data(self, test_db, test_app):
         """Test that backup includes application data."""
         cmd = BackupCreateCmd(db_session=test_db)
 
-        result = cmd.call("test-app", "--no-addons")
+        cmd.call("test-app", "--no-addons")
 
         # Find the backup directory
         backup_dir = HopConfig.get_instance().BACKUP_ROOT / "apps" / "test-app"
@@ -184,7 +184,7 @@ def test_create_backup_generates_metadata(self, test_db, test_app):
         """Test that backup generates correct metadata."""
         cmd = BackupCreateCmd(db_session=test_db)
 
-        result = cmd.call("test-app", "--no-addons")
+        cmd.call("test-app", "--no-addons")
 
         # Find the backup directory
         backup_dir = HopConfig.get_instance().BACKUP_ROOT / "apps" / "test-app"
@@ -292,7 +292,7 @@ def test_info_backup(self, test_db, test_app):
         """Test getting backup info."""
         # Create a backup
         create_cmd = BackupCreateCmd(db_session=test_db)
-        create_result = create_cmd.call("test-app", "--no-addons")
+        create_cmd.call("test-app", "--no-addons")
 
         # Extract backup ID from result
         backup_dir = HopConfig.get_instance().BACKUP_ROOT / "apps" / "test-app"
diff --git a/packages/hop3-server/tests/b_integration/test_dashboard_views.py b/packages/hop3-server/tests/b_integration/test_dashboard_views.py
@@ -60,7 +60,7 @@ def isolated_database(monkeypatch, worker_id):
     reset_session_factory_cache()
 
     # Create the database schema
-    session_factory = get_session_factory()
+    get_session_factory()
 
     yield db_uri
 
diff --git a/packages/hop3-server/tests/c_system/xxx_test_e2e_git_hook.py b/packages/hop3-server/tests/c_system/xxx_test_e2e_git_hook.py
@@ -97,7 +97,7 @@ def test_git_hook_path_traversal_prevention(
         self, deployed_app: dict, e2e_auth_token: str
     ):
         """Test that git-hook prevents path traversal in filenames."""
-        app_name = deployed_app["name"]
+        deployed_app["name"]
         app_dir = deployed_app["dir"]
 
         original_dir = Path.cwd()
@@ -109,7 +109,6 @@ def test_git_hook_path_traversal_prevention(
 
             # Try to create a file with path traversal (this will fail in git)
             # Git doesn't allow ../../ in filenames, so this is mainly a documentation test
-            malicious_name = "../../etc/passwd"
 
             # Create normal file
             (app_dir / "app.py").write_text("# test")
diff --git a/packages/hop3-server/tests/conftest.py b/packages/hop3-server/tests/conftest.py
@@ -23,6 +23,7 @@
 
 from hop3.orm import reset_session_factory_cache
 
+# Import fixtures from di_fixtures.py to make them available to all tests
 from .di_fixtures import di_container  # noqa: F401
 
 
diff --git a/packages/hop3-server/tests/d_e2e/xxx_test_full_deployment.py b/packages/hop3-server/tests/d_e2e/xxx_test_full_deployment.py
@@ -260,7 +260,7 @@ def test_git_hook_deployment(
         self, hop3_container: dict[str, Any], hop3_command, test_app_dir: Path
     ):
         """Test deploying via git-hook command (simulating git push)."""
-        app_name = f"githook-test-{int(time.time())}"
+        f"githook-test-{int(time.time())}"
 
         # Create Flask app
         (test_app_dir / "app.py").write_text("""
@@ -301,7 +301,7 @@ def index():
             text=True,
             check=True,
         )
-        commit_sha = result.stdout.strip()
+        result.stdout.strip()
 
         # Check if git-hook command exists
         result = hop3_command("help")
diff --git a/packages/hop3-tui/src/hop3_tui/screens/logs.py b/packages/hop3-tui/src/hop3_tui/screens/logs.py
@@ -88,8 +88,8 @@ class LogsScreen(Screen):
         Binding("d", "download_logs", "Download"),
     ]
 
-    paused: reactive[bool] = reactive(False)  # noqa: FBT003
-    auto_scroll: reactive[bool] = reactive(True)  # noqa: FBT003
+    paused: reactive[bool] = reactive(False)
+    auto_scroll: reactive[bool] = reactive(True)
 
     def __init__(self, app_name: str = "") -> None:
         super().__init__()
@@ -174,7 +174,7 @@ def _style_log_line(self, line: str) -> str:
             return f"[dim]{line}[/]"
         return line
 
-    def watch_paused(self, paused: bool) -> None:  # noqa: FBT001
+    def watch_paused(self, paused: bool) -> None:
         """Update status when paused state changes."""
         status = self.query_one("#logs-status", Static)
         if paused:
diff --git a/packages/hop3-tui/src/hop3_tui/screens/system_logs.py b/packages/hop3-tui/src/hop3_tui/screens/system_logs.py
@@ -89,8 +89,8 @@ class SystemLogsScreen(Screen):
         Binding("d", "download_logs", "Download"),
     ]
 
-    paused: reactive[bool] = reactive(False)  # noqa: FBT003
-    auto_scroll: reactive[bool] = reactive(True)  # noqa: FBT003
+    paused: reactive[bool] = reactive(False)
+    auto_scroll: reactive[bool] = reactive(True)
 
     def __init__(self) -> None:
         super().__init__()
@@ -196,7 +196,7 @@ def _style_log_line(self, line: str) -> str:
             return f"[dim]{line}[/]"
         return line
 
-    def watch_paused(self, paused: bool) -> None:  # noqa: FBT001
+    def watch_paused(self, paused: bool) -> None:
         """Update status bar when paused state changes."""
         status = self.query_one("#status-bar", Static)
         if paused:
diff --git a/packages/hop3-tui/src/hop3_tui/widgets/confirmation.py b/packages/hop3-tui/src/hop3_tui/widgets/confirmation.py
diff --git a/packages/hop3-tui/tests/test_app.py b/packages/hop3-tui/tests/test_app.py
diff --git a/packages/hop3-tui/tests/test_screens.py b/packages/hop3-tui/tests/test_screens.py
diff --git a/packages/hop3-tui/tests/test_widgets.py b/packages/hop3-tui/tests/test_widgets.py
diff --git a/ruff.toml b/ruff.toml
