[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

pytest_postgresql/executor.py

@@ -17,15 +17,15 @@
 # along with pytest-postgresql.  If not, see <http://www.gnu.org/licenses/>.
 """PostgreSQL executor crafter around pg_ctl."""
 
+import os
 import os.path
 import platform
 import re
 import shutil
+import signal
 import subprocess
 import tempfile
 import time
-import os
-import signal
 from typing import Any, Optional, TypeVar
 
 from mirakuru import TCPExecutor
@@ -56,9 +56,9 @@ def _get_base_command(self) -> str:
             # Windows doesn't handle single quotes well in subprocess calls
             return (
                 '{executable} start -D "{datadir}" '
-                "-o \"-F -p {port} -c log_destination=stderr "
+                '-o "-F -p {port} -c log_destination=stderr '
                 "-c logging_collector=off "
-                "-c unix_socket_directories={unixsocketdir} {postgres_options}\" "
+                '-c unix_socket_directories={unixsocketdir} {postgres_options}" '
                 '-l "{logfile}" {startparams}'
             )
         else:
@@ -240,7 +240,7 @@ def _windows_terminate_process(self, sig: Optional[int] = None) -> None:
         """Terminate process on Windows."""
         if self.process is None:
             return
-        
+
         try:
             if platform.system() == "Windows":
                 # On Windows, try to terminate gracefully first

tests/test_windows_compatibility.py

@@ -1,10 +1,7 @@
 """Test Windows compatibility fixes for pytest-postgresql."""
 
-import platform
-import pytest
-from unittest.mock import Mock, patch, MagicMock
 import subprocess
-import signal
+from unittest.mock import MagicMock, patch
 
 from pytest_postgresql.executor import PostgreSQLExecutor
 
@@ -24,8 +21,8 @@ def test_get_base_command_windows(self):
             startparams="-w",
             dbname="test",
         )
-        
-        with patch('platform.system', return_value='Windows'):
+
+        with patch("platform.system", return_value="Windows"):
             command = executor._get_base_command()
             # Windows command should not have single quotes around stderr
             assert "log_destination=stderr" in command
@@ -45,8 +42,8 @@ def test_get_base_command_unix(self):
             startparams="-w",
             dbname="test",
         )
-        
-        with patch('platform.system', return_value='Linux'):
+
+        with patch("platform.system", return_value="Linux"):
             command = executor._get_base_command()
             # Unix command should have single quotes around stderr
             assert "log_destination='stderr'" in command
@@ -64,14 +61,14 @@ def test_windows_terminate_process(self):
             startparams="-w",
             dbname="test",
         )
-        
+
         # Mock process
         mock_process = MagicMock()
         executor.process = mock_process
-        
-        with patch('platform.system', return_value='Windows'):
+
+        with patch("platform.system", return_value="Windows"):
             executor._windows_terminate_process()
-            
+
             # Should call terminate first
             mock_process.terminate.assert_called_once()
             mock_process.wait.assert_called()
@@ -88,15 +85,15 @@ def test_windows_terminate_process_force_kill(self):
             startparams="-w",
             dbname="test",
         )
-        
+
         # Mock process that times out
         mock_process = MagicMock()
         mock_process.wait.side_effect = [subprocess.TimeoutExpired(cmd="test", timeout=5), None]
         executor.process = mock_process
-        
-        with patch('platform.system', return_value='Windows'):
+
+        with patch("platform.system", return_value="Windows"):
             executor._windows_terminate_process()
-            
+
             # Should call terminate, wait (timeout), then kill, then wait again
             mock_process.terminate.assert_called_once()
             mock_process.kill.assert_called_once()
@@ -114,14 +111,16 @@ def test_stop_method_windows(self):
             startparams="-w",
             dbname="test",
         )
-        
+
         # Mock subprocess and process
-        with patch('subprocess.check_output') as mock_subprocess, \
-             patch('platform.system', return_value='Windows'), \
-             patch.object(executor, '_windows_terminate_process') as mock_terminate:
-            
+        with (
+            patch("subprocess.check_output") as mock_subprocess,
+            patch("platform.system", return_value="Windows"),
+            patch.object(executor, "_windows_terminate_process") as mock_terminate,
+        ):
+
             result = executor.stop()
-            
+
             # Should call pg_ctl stop and Windows terminate
             mock_subprocess.assert_called_once()
             mock_terminate.assert_called_once_with(None)
@@ -139,15 +138,17 @@ def test_stop_method_unix(self):
             startparams="-w",
             dbname="test",
         )
-        
+
         # Mock subprocess and super().stop
-        with patch('subprocess.check_output') as mock_subprocess, \
-             patch('platform.system', return_value='Linux'), \
-             patch('pytest_postgresql.executor.TCPExecutor.stop') as mock_super_stop:
-            
+        with (
+            patch("subprocess.check_output") as mock_subprocess,
+            patch("platform.system", return_value="Linux"),
+            patch("pytest_postgresql.executor.TCPExecutor.stop") as mock_super_stop,
+        ):
+
             mock_super_stop.return_value = executor
             result = executor.stop()
-            
+
             # Should call pg_ctl stop and parent class stop
             mock_subprocess.assert_called_once()
             mock_super_stop.assert_called_once_with(None, None)
@@ -165,24 +166,28 @@ def test_stop_method_fallback_on_killpg_error(self):
             startparams="-w",
             dbname="test",
         )
-        
+
         # Mock subprocess and super().stop to raise AttributeError
-        with patch('subprocess.check_output') as mock_subprocess, \
-             patch('platform.system', return_value='Linux'), \
-             patch('pytest_postgresql.executor.TCPExecutor.stop', 
-                   side_effect=AttributeError("module 'os' has no attribute 'killpg'")), \
-             patch.object(executor, '_windows_terminate_process') as mock_terminate:
-            
+        with (
+            patch("subprocess.check_output") as mock_subprocess,
+            patch("platform.system", return_value="Linux"),
+            patch(
+                "pytest_postgresql.executor.TCPExecutor.stop",
+                side_effect=AttributeError("module 'os' has no attribute 'killpg'"),
+            ),
+            patch.object(executor, "_windows_terminate_process") as mock_terminate,
+        ):
+
             result = executor.stop()
-            
+
             # Should call pg_ctl stop, fail on super().stop, then use Windows terminate
             mock_subprocess.assert_called_once()
             mock_terminate.assert_called_once_with(None)
             assert result is executor
 
     def test_command_formatting_windows(self):
         """Test that command is properly formatted for Windows."""
-        with patch('platform.system', return_value='Windows'):
+        with patch("platform.system", return_value="Windows"):
             executor = PostgreSQLExecutor(
                 executable="C:/Program Files/PostgreSQL/bin/pg_ctl.exe",
                 host="localhost",
@@ -192,21 +197,21 @@ def test_command_formatting_windows(self):
                 logfile="C:/temp/log.txt",
                 startparams="-w -s",
                 dbname="testdb",
-                postgres_options="-c shared_preload_libraries=test"
+                postgres_options="-c shared_preload_libraries=test",
             )
-            
+
             # The command should be properly formatted without quotes around stderr
             expected_parts = [
                 "C:/Program Files/PostgreSQL/bin/pg_ctl.exe start",
                 '-D "C:/temp/data"',
-                "-o \"-F -p 5555 -c log_destination=stderr",
+                '-o "-F -p 5555 -c log_destination=stderr',
                 "-c logging_collector=off",
                 "-c unix_socket_directories=C:/temp/socket",
-                "-c shared_preload_libraries=test\"",
+                '-c shared_preload_libraries=test"',
                 '-l "C:/temp/log.txt"',
-                "-w -s"
+                "-w -s",
             ]
-            
+
             # Check if all expected parts are in the command
             command = executor.command
             for part in expected_parts: