From 7775f1d329a2f559299663ca488db5f7635669d7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 00:42:54 +0000 Subject: [PATCH] pre-commit auto-fixes --- src/custodian/jdftx/jobs.py | 3 ++- tests/jdftx/conftest.py | 3 ++- tests/jdftx/test_jobs.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/custodian/jdftx/jobs.py b/src/custodian/jdftx/jobs.py index 2359ea3f..fe9e19bf 100644 --- a/src/custodian/jdftx/jobs.py +++ b/src/custodian/jdftx/jobs.py @@ -2,10 +2,11 @@ import logging import os -import subprocess import shlex +import subprocess import psutil + from custodian.custodian import Job logger = logging.getLogger(__name__) diff --git a/tests/jdftx/conftest.py b/tests/jdftx/conftest.py index 2f382e5b..475dcdeb 100644 --- a/tests/jdftx/conftest.py +++ b/tests/jdftx/conftest.py @@ -1,6 +1,7 @@ import pytest from custodian.jdftx.jobs import JDFTxJob + @pytest.fixture() def jdftx_job(): - return JDFTxJob(jdftx_cmd="jdftx", output_file="jdftx.out") \ No newline at end of file + return JDFTxJob(jdftx_cmd="jdftx", output_file="jdftx.out") diff --git a/tests/jdftx/test_jobs.py b/tests/jdftx/test_jobs.py index 9fd88cba..92ecc4d4 100644 --- a/tests/jdftx/test_jobs.py +++ b/tests/jdftx/test_jobs.py @@ -4,12 +4,12 @@ from unittest.mock import ANY, MagicMock, patch import psutil -import pytest from custodian.jdftx.jobs import JDFTxJob TEST_DIR = Path(__file__).resolve().parent.parent TEST_FILES = f"{TEST_DIR}/files/jdftx" + def create_mock_process( name="jdftx", open_files=None, pid=12345, name_side_effect=None, wait_side_effect=None, terminate_side_effect=None ):