From 0a91829112fbaa2afcb71e7d907f7d4032c0767f Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Wed, 22 Jan 2025 23:21:47 +0800 Subject: [PATCH] ruff check --fix --- conftest.py | 7 +++---- src/molecule_plugins/podman/driver.py | 4 ++-- src/molecule_plugins/vagrant/modules/vagrant.py | 12 +++--------- test/azure/functional/test_azure.py | 3 +-- test/containers/functional/test_containers.py | 1 - test/docker/test_func.py | 3 +-- test/ec2/functional/test_ec2.py | 3 +-- test/gce/functional/test_func.py | 3 +-- test/openstack/test_func.py | 1 - test/podman/test_func.py | 1 - test/vagrant-plugin/functional/test_func.py | 10 ++++------ 11 files changed, 16 insertions(+), 32 deletions(-) diff --git a/conftest.py b/conftest.py index 975f9aa..2a96b19 100644 --- a/conftest.py +++ b/conftest.py @@ -3,14 +3,13 @@ import random import shutil import string +from pathlib import Path import pytest -from pathlib import Path - -from molecule import config, logger, util -from molecule.scenario import ephemeral_directory +from molecule import config, logger from molecule.app import get_app +from molecule.scenario import ephemeral_directory LOG = logger.get_logger(__name__) diff --git a/src/molecule_plugins/podman/driver.py b/src/molecule_plugins/podman/driver.py index e5dcb0b..8c7a150 100644 --- a/src/molecule_plugins/podman/driver.py +++ b/src/molecule_plugins/podman/driver.py @@ -21,17 +21,17 @@ import os import warnings -from shutil import which from pathlib import Path +from shutil import which from ansible_compat.runtime import Runtime from packaging.version import Version from molecule import logger, util from molecule.api import Driver, MoleculeRuntimeWarning +from molecule.app import get_app from molecule.constants import RC_SETUP_ERROR from molecule.util import sysexit_with_message -from molecule.app import get_app log = logger.get_logger(__name__) diff --git a/src/molecule_plugins/vagrant/modules/vagrant.py b/src/molecule_plugins/vagrant/modules/vagrant.py index 10661bc..0e09428 100755 --- a/src/molecule_plugins/vagrant/modules/vagrant.py +++ b/src/molecule_plugins/vagrant/modules/vagrant.py @@ -503,10 +503,7 @@ def _conf_instance(self, instance_name): try: return self._vagrant.conf(vm_name=instance_name) except Exception: - msg = "Failed to get vagrant config for {}: See log file '{}'".format( - instance_name, - self._get_stderr_log(), - ) + msg = f"Failed to get vagrant config for {instance_name}: See log file '{self._get_stderr_log()}'" with open(self._get_stderr_log(), encoding="utf-8") as f: self.result["stderr"] = f.read() self._module.fail_json(msg=msg, **self.result) @@ -517,10 +514,7 @@ def _status_instance(self, instance_name): return {"name": s.name, "state": s.state, "provider": s.provider} except Exception: - msg = "Failed to get status for {}: See log file '{}'".format( - instance_name, - self._get_stderr_log(), - ) + msg = f"Failed to get status for {instance_name}: See log file '{self._get_stderr_log()}'" with open(self._get_stderr_log(), encoding="utf-8") as f: self.result["stderr"] = f.read() self._module.fail_json(msg=msg, **self.result) @@ -697,7 +691,7 @@ def _get_stdout_log(self): def _get_stderr_log(self): return self._get_vagrant_log("err") - def _get_vagrant_log(self, __type): + def _get_vagrant_log(self, __type, /): return os.path.join(self._config["workdir"], f"vagrant.{__type}") diff --git a/test/azure/functional/test_azure.py b/test/azure/functional/test_azure.py index 6af47ea..f8f0438 100644 --- a/test/azure/functional/test_azure.py +++ b/test/azure/functional/test_azure.py @@ -20,11 +20,10 @@ # DEALINGS IN THE SOFTWARE. import os +from pathlib import Path import pytest -from pathlib import Path - from conftest import change_dir_to from molecule import logger from molecule.app import get_app diff --git a/test/containers/functional/test_containers.py b/test/containers/functional/test_containers.py index 5796786..2579977 100644 --- a/test/containers/functional/test_containers.py +++ b/test/containers/functional/test_containers.py @@ -21,7 +21,6 @@ """Functional Tests.""" import os - from pathlib import Path from conftest import change_dir_to, molecule_directory diff --git a/test/docker/test_func.py b/test/docker/test_func.py index 18dfb06..aba0611 100644 --- a/test/docker/test_func.py +++ b/test/docker/test_func.py @@ -4,11 +4,10 @@ import pathlib import shutil import subprocess +from pathlib import Path import pytest -from pathlib import Path - from conftest import change_dir_to from molecule import logger from molecule.app import get_app diff --git a/test/ec2/functional/test_ec2.py b/test/ec2/functional/test_ec2.py index fbeab94..f721a79 100644 --- a/test/ec2/functional/test_ec2.py +++ b/test/ec2/functional/test_ec2.py @@ -20,11 +20,10 @@ # DEALINGS IN THE SOFTWARE. import os +from pathlib import Path import pytest -from pathlib import Path - from conftest import change_dir_to, metadata_lint_update from molecule import logger from molecule.app import get_app diff --git a/test/gce/functional/test_func.py b/test/gce/functional/test_func.py index f38f386..8fbacdb 100644 --- a/test/gce/functional/test_func.py +++ b/test/gce/functional/test_func.py @@ -20,11 +20,10 @@ # DEALINGS IN THE SOFTWARE. import os +from pathlib import Path import pytest -from pathlib import Path - from conftest import change_dir_to, metadata_lint_update from molecule import logger from molecule.app import get_app diff --git a/test/openstack/test_func.py b/test/openstack/test_func.py index 0f4edf1..6ca8aa8 100644 --- a/test/openstack/test_func.py +++ b/test/openstack/test_func.py @@ -4,7 +4,6 @@ import pathlib import shutil import subprocess - from pathlib import Path import pytest diff --git a/test/podman/test_func.py b/test/podman/test_func.py index d54d22d..25cc779 100644 --- a/test/podman/test_func.py +++ b/test/podman/test_func.py @@ -3,7 +3,6 @@ import os import pathlib import subprocess - from pathlib import Path from conftest import change_dir_to diff --git a/test/vagrant-plugin/functional/test_func.py b/test/vagrant-plugin/functional/test_func.py index 97a6a5a..3373ab1 100644 --- a/test/vagrant-plugin/functional/test_func.py +++ b/test/vagrant-plugin/functional/test_func.py @@ -22,16 +22,15 @@ import os import platform import shutil +from pathlib import Path import pytest import vagrant -from pathlib import Path - from conftest import change_dir_to from molecule import logger, util -from molecule.scenario import ephemeral_directory from molecule.app import get_app +from molecule.scenario import ephemeral_directory LOG = logger.get_logger(__name__) @@ -40,9 +39,8 @@ def is_vagrant_supported() -> bool: """Return True if vagrant is installed and current platform is supported.""" if not shutil.which("vagrant"): return False - if platform.machine() == "arm64" and platform.system() == "Darwin": - return False - return True + if not (platform.machine() == "arm64" and platform.system() == "Darwin"): + return True @pytest.mark.skipif(