refactor: Improve test organization and error handling tests

Author: Yoshihiro Takahara

tests/test_shell_executor_error_cases.py

@@ -7,6 +7,11 @@
 from mcp_shell_server.shell_executor import ShellExecutor
 
 
+def clear_env(monkeypatch):
+    monkeypatch.delenv("ALLOW_COMMANDS", raising=False)
+    monkeypatch.delenv("ALLOWED_COMMANDS", raising=False)
+
+
 @pytest.fixture
 def temp_test_dir():
     """Create a temporary directory for testing"""
@@ -20,15 +25,15 @@ async def test_empty_command_validation():
     """Test validation of empty commands"""
     executor = ShellExecutor()
 
-    # 空のコマンドのテスト
+    # Test empty command
     with pytest.raises(ValueError, match="Empty command"):
         executor._validate_command([])
 
 
 @pytest.mark.asyncio
 async def test_no_allowed_commands_validation(monkeypatch):
     """Test validation when no commands are allowed"""
-    # ALLOW_COMMANDSを削除
+    # Remove ALLOW_COMMANDS
     monkeypatch.delenv("ALLOW_COMMANDS", raising=False)
     monkeypatch.delenv("ALLOWED_COMMANDS", raising=False)
 
@@ -47,7 +52,7 @@ async def test_shell_operator_validation():
 
     operators = [";" "&&", "||", "|"]
     for op in operators:
-        # シェル操作子の検証
+        # Test shell operator validation
         with pytest.raises(ValueError, match=f"Unexpected shell operator: {op}"):
             executor._validate_no_shell_operators(op)
 
@@ -58,7 +63,7 @@ async def test_process_execution_timeout(monkeypatch, temp_test_dir):
     monkeypatch.setenv("ALLOW_COMMANDS", "sleep")
     executor = ShellExecutor()
 
-    # プロセスのタイムアウトをテスト
+    # Test process timeout
     command = ["sleep", "5"]
     with pytest.raises(asyncio.TimeoutError):
         await asyncio.wait_for(executor.execute(command, temp_test_dir), timeout=0.1)
@@ -70,6 +75,24 @@ async def test_process_failure(monkeypatch, temp_test_dir):
     monkeypatch.setenv("ALLOW_COMMANDS", "false")
     executor = ShellExecutor()
 
-    # falseコマンドは常に終了コード1を返す
+    # false command always returns exit code 1
     result = await executor.execute(["false"], temp_test_dir)
     assert result["status"] == 1
+
+
+@pytest.mark.asyncio
+async def test_directory_validation():
+    """Test directory validation"""
+    executor = ShellExecutor()
+
+    # Test missing directory
+    with pytest.raises(ValueError, match="Directory is required"):
+        executor._validate_directory(None)
+
+    # Test relative path
+    with pytest.raises(ValueError, match="Directory must be an absolute path"):
+        executor._validate_directory("relative/path")
+
+    # Test non-existent directory
+    with pytest.raises(ValueError, match="Directory does not exist"):
+        executor._validate_directory("/nonexistent/directory")