From c1c726a17b49c9890a44ee32ca00b96563483baa Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Wed, 6 Mar 2024 15:59:58 -0500 Subject: [PATCH] Add import order/style check with isort Avocado has been using isort to enforce one import order/code style for a long time, with very good results. Let's expand the same to Avocado-VT. With a common code style across Avocado and Avocado-VT it'll be easier to move libraries to the common autils repo. Reference: https://github.com/avocado-framework/autils/issues/3 Signed-off-by: Cleber Rosa --- Makefile | 1 + avocado_vt/discovery.py | 1 + avocado_vt/loader.py | 5 +- avocado_vt/options.py | 20 ++-- avocado_vt/plugins/vt.py | 4 +- avocado_vt/plugins/vt_bootstrap.py | 7 +- avocado_vt/plugins/vt_joblock.py | 12 +-- avocado_vt/plugins/vt_list.py | 7 +- avocado_vt/plugins/vt_list_archs.py | 1 + avocado_vt/plugins/vt_list_guests.py | 1 + avocado_vt/plugins/vt_runner.py | 4 +- avocado_vt/plugins/vt_settings.py | 3 +- avocado_vt/test.py | 32 +++--- avocado_vt/utils.py | 3 +- examples/tests/guest_hostname.py | 1 - examples/tests/hostname.py | 1 - examples/tests/ls_disk.py | 1 - examples/tests/service.py | 6 +- examples/tests/template.py | 1 - requirements-travis.txt | 1 + scripts/cd_hash.py | 6 +- scripts/download_manager.py | 12 +-- scripts/github/cache_populate.py | 5 +- scripts/github/example.py | 7 +- scripts/github/github_issues.py | 5 +- scripts/github/label_issues.py | 3 +- scripts/github/pulls_applied.py | 5 +- scripts/github/stale_pulls.py | 7 +- scripts/github/unassigned_issues.py | 3 +- scripts/koji_pkgspec.py | 2 +- scripts/package_jeos.py | 5 +- scripts/regression.py | 5 +- scripts/scan_results.py | 8 +- scripts/tapfd_helper.py | 2 +- scripts/virt_disk.py | 2 +- selftests/doc/test_doc_build.py | 1 - selftests/functional/test_basic.py | 5 +- selftests/isort.sh | 3 + selftests/run | 3 +- selftests/unit/test_cartesian_config.py | 5 +- selftests/unit/test_cartesian_config_lint.py | 1 - selftests/unit/test_installer.py | 5 +- selftests/unit/test_iscsi.py | 9 +- selftests/unit/test_libvirt_network.py | 6 +- selftests/unit/test_libvirt_storage.py | 6 +- selftests/unit/test_libvirt_xml.py | 25 +++-- selftests/unit/test_nfs.py | 11 +-- selftests/unit/test_propcan.py | 2 +- selftests/unit/test_qemu_devices.py | 11 +-- selftests/unit/test_qemu_monitor.py | 6 +- selftests/unit/test_qemu_qtree.py | 7 +- selftests/unit/test_remote.py | 5 +- selftests/unit/test_setup_networking.py | 2 +- selftests/unit/test_utils_cgroup.py | 5 +- selftests/unit/test_utils_config.py | 2 +- selftests/unit/test_utils_env.py | 10 +- selftests/unit/test_utils_libguestfs.py | 3 +- selftests/unit/test_utils_misc.py | 7 +- selftests/unit/test_utils_net.py | 18 ++-- selftests/unit/test_utils_params.py | 2 +- selftests/unit/test_versionable_class.py | 4 +- selftests/unit/test_virsh.py | 3 +- selftests/unit/test_wrappers.py | 9 +- selftests/unit/test_xml_utils.py | 6 +- setup.py | 3 +- virttest/_wrappers.py | 11 +-- virttest/asset.py | 13 +-- virttest/base_installer.py | 13 +-- virttest/bootstrap.py | 19 +--- virttest/build_helper.py | 6 +- virttest/cartesian_config.py | 4 +- virttest/ceph.py | 4 +- virttest/cpu.py | 14 +-- virttest/curl.py | 4 +- virttest/data_dir.py | 6 +- virttest/env_process.py | 83 ++++++++-------- virttest/funcatexit.py | 3 +- virttest/gluster.py | 11 +-- virttest/graphical_console.py | 9 +- virttest/guest_agent.py | 12 +-- virttest/http_server.py | 4 +- virttest/installer.py | 4 +- virttest/ip_sniffing.py | 5 +- virttest/iscsi.py | 17 ++-- virttest/kernel_interface.py | 3 +- virttest/libvirt_cgroup.py | 5 +- virttest/libvirt_installer.py | 4 +- virttest/libvirt_remote.py | 2 - virttest/libvirt_storage.py | 5 +- virttest/libvirt_version.py | 6 +- virttest/libvirt_vm.py | 46 ++++----- virttest/libvirt_xml/__init__.py | 21 ++-- virttest/libvirt_xml/accessors.py | 3 +- virttest/libvirt_xml/backup_xml.py | 2 +- virttest/libvirt_xml/base.py | 9 +- virttest/libvirt_xml/capability_xml.py | 2 +- virttest/libvirt_xml/checkpoint_xml.py | 2 +- virttest/libvirt_xml/devices/base.py | 3 +- virttest/libvirt_xml/devices/channel.py | 3 +- virttest/libvirt_xml/devices/character.py | 2 +- virttest/libvirt_xml/devices/console.py | 2 +- virttest/libvirt_xml/devices/filesystem.py | 2 +- virttest/libvirt_xml/devices/graphics.py | 4 +- virttest/libvirt_xml/devices/hostdev.py | 3 +- virttest/libvirt_xml/devices/interface.py | 3 +- virttest/libvirt_xml/devices/lease.py | 2 +- virttest/libvirt_xml/devices/librarian.py | 1 - virttest/libvirt_xml/devices/memory.py | 3 +- virttest/libvirt_xml/devices/serial.py | 2 +- virttest/libvirt_xml/devices/tpm.py | 2 +- virttest/libvirt_xml/devices/watchdog.py | 3 +- virttest/libvirt_xml/domcapability_xml.py | 2 +- virttest/libvirt_xml/network_xml.py | 2 +- virttest/libvirt_xml/nodedev_xml.py | 2 +- virttest/libvirt_xml/nwfilter_binding.py | 2 +- .../libvirt_xml/nwfilter_protocols/base.py | 2 +- .../nwfilter_protocols/librarian.py | 1 - virttest/libvirt_xml/nwfilter_xml.py | 2 +- virttest/libvirt_xml/pool_xml.py | 8 +- virttest/libvirt_xml/secret_xml.py | 3 +- virttest/libvirt_xml/snapshot_xml.py | 3 +- virttest/libvirt_xml/vm_xml.py | 5 +- virttest/libvirt_xml/vol_xml.py | 2 +- virttest/libvirtd_decorator.py | 6 +- virttest/logging_manager.py | 1 - virttest/lvm.py | 13 ++- virttest/lvsb.py | 3 +- virttest/lvsb_base.py | 2 - virttest/lvsbs.py | 6 +- virttest/migration.py | 33 ++++--- virttest/migration_template.py | 33 +++---- virttest/nbd.py | 5 +- virttest/nfs.py | 17 ++-- virttest/openvswitch.py | 8 +- virttest/ovirt.py | 3 +- virttest/ovs_utils.py | 1 - virttest/postprocess_iozone.py | 10 +- virttest/ppm_utils.py | 14 +-- virttest/qemu_devices/qcontainer.py | 35 ++++--- virttest/qemu_devices/qdevices.py | 14 +-- virttest/qemu_installer.py | 2 +- virttest/qemu_io.py | 4 +- virttest/qemu_migration.py | 4 +- virttest/qemu_monitor.py | 6 +- virttest/qemu_qtree.py | 8 +- virttest/qemu_storage.py | 9 +- virttest/qemu_virtio_port.py | 9 +- virttest/qemu_vm.py | 66 ++++++------- virttest/remote.py | 12 +-- virttest/remote_build.py | 5 +- virttest/remote_commander/messenger.py | 6 +- virttest/remote_commander/remote_master.py | 6 +- virttest/remote_commander/remote_runner.py | 20 ++-- virttest/scan_autotest_results.py | 2 +- virttest/scheduler.py | 3 +- virttest/shared/deps/run_autotest/boottool.py | 11 +-- .../kernel_install/kernelinstall.py | 7 +- .../VirtIoChannel_guest_send_receive.py | 4 +- .../deps/serial/serial_host_send_receive.py | 2 +- .../shared/deps/serial/windows_support.py | 10 +- virttest/shared/scripts/cb.py | 4 +- virttest/shared/scripts/cmd_runner.py | 8 +- virttest/shared/scripts/dd.py | 3 +- virttest/shared/scripts/duplicate_pages.py | 1 - .../shared/scripts/ksm_overcommit_guest.py | 10 +- virttest/shared/scripts/multicast_guest.py | 4 +- virttest/shared/scripts/telnet.py | 4 +- .../shared/scripts/virtio_console_guest.py | 19 ++-- virttest/ssh_key.py | 6 +- virttest/staging/__init__.py | 5 +- virttest/staging/lv_utils.py | 2 +- virttest/staging/service.py | 3 +- virttest/staging/utils_cgroup.py | 8 +- virttest/staging/utils_koji.py | 8 +- virttest/staging/utils_memory.py | 5 +- virttest/standalone_test.py | 3 +- virttest/step_editor.py | 5 +- virttest/storage.py | 39 ++++---- virttest/storage_ssh.py | 4 +- virttest/syslog_server.py | 2 +- virttest/test_setup/__init__.py | 61 +++++------- virttest/test_setup/core.py | 5 +- virttest/test_setup/libvirt_setup.py | 2 +- virttest/test_setup/networking.py | 2 +- virttest/tests/unattended_install.py | 49 +++++----- virttest/unittest_utils/mock.py | 2 +- .../device_xml/test_controller_xml.py | 1 - .../device_xml/test_interface_xml.py | 1 - virttest/unittests/test_utils_misc.py | 3 +- virttest/unittests/test_utils_test__init__.py | 7 +- virttest/utils_backup.py | 13 +-- virttest/utils_config.py | 1 + virttest/utils_conn.py | 19 ++-- virttest/utils_disk.py | 19 ++-- virttest/utils_env.py | 8 +- virttest/utils_gdb.py | 5 +- virttest/utils_hotplug.py | 2 +- virttest/utils_iptables.py | 3 +- virttest/utils_kernel_module.py | 2 +- virttest/utils_libguestfs.py | 5 +- virttest/utils_libvirt/libvirt_bios.py | 1 - virttest/utils_libvirt/libvirt_ceph_utils.py | 11 +-- virttest/utils_libvirt/libvirt_config.py | 5 +- virttest/utils_libvirt/libvirt_disk.py | 9 +- .../utils_libvirt/libvirt_embedded_qemu.py | 8 +- virttest/utils_libvirt/libvirt_misc.py | 2 +- virttest/utils_libvirt/libvirt_monitor.py | 3 +- virttest/utils_libvirt/libvirt_nested.py | 4 +- virttest/utils_libvirt/libvirt_network.py | 10 +- virttest/utils_libvirt/libvirt_numa.py | 2 +- virttest/utils_libvirt/libvirt_pcicontr.py | 2 +- virttest/utils_libvirt/libvirt_secret.py | 3 +- virttest/utils_libvirt/libvirt_service.py | 4 +- .../utils_libvirt/libvirt_unprivileged.py | 5 +- virttest/utils_libvirt/libvirt_virtio.py | 2 +- virttest/utils_libvirtd.py | 9 +- virttest/utils_logfile.py | 2 +- virttest/utils_misc.py | 76 +++++++------- virttest/utils_nbd.py | 7 +- virttest/utils_net.py | 57 +++++------ virttest/utils_netperf.py | 8 +- virttest/utils_npiv.py | 6 +- virttest/utils_numeric.py | 6 +- virttest/utils_package.py | 5 +- virttest/utils_params.py | 2 +- virttest/utils_pyvmomi.py | 3 +- virttest/utils_qemu.py | 2 +- virttest/utils_sasl.py | 7 +- virttest/utils_scheduling.py | 2 +- virttest/utils_selinux.py | 6 +- virttest/utils_spice.py | 6 +- virttest/utils_split_daemons.py | 10 +- virttest/utils_sriov.py | 6 +- virttest/utils_stress.py | 12 +-- virttest/utils_switchdev.py | 3 +- virttest/utils_test/__init__.py | 48 ++++----- virttest/utils_test/libguestfs.py | 9 +- virttest/utils_test/libvirt.py | 98 +++++++++---------- virttest/utils_test/libvirt_domjobinfo.py | 4 +- virttest/utils_test/qemu/__init__.py | 8 +- virttest/utils_test/qemu/migration.py | 15 +-- virttest/utils_time.py | 6 +- virttest/utils_v2v.py | 22 ++--- virttest/utils_vdpa.py | 6 +- virttest/utils_version.py | 4 +- virttest/utils_virtio_port.py | 4 +- virttest/utils_vsock.py | 4 +- virttest/utils_windows/drive.py | 3 +- virttest/utils_windows/virtio_win.py | 5 +- virttest/utils_windows/wmic.py | 1 - virttest/utils_zcrypt.py | 3 +- virttest/video_maker.py | 5 +- virttest/virsh.py | 23 ++--- virttest/virt_admin.py | 16 +-- virttest/virt_vm.py | 24 ++--- virttest/vt_console.py | 1 - virttest/vt_utils/block.py | 4 +- virttest/vt_utils/filesystem.py | 1 + virttest/xml_utils.py | 9 +- virttest/yumrepo.py | 1 - 260 files changed, 926 insertions(+), 1252 deletions(-) create mode 100755 selftests/isort.sh diff --git a/Makefile b/Makefile index 84e1b5438d..63109feb28 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,7 @@ requirements: pip check: ./selftests/style.sh + ./selftests/isort.sh inspekt lint --disable W,R,C,E0203,E0601,E1002,E1101,E1102,E1103,E1120,F0401,I0011,E1003,W605,I1101 --exclude avocado-libs,scripts/github pylint --errors-only --disable=all --enable=spelling --spelling-dict=en_US --spelling-private-dict-file=spell.ignore * diff --git a/avocado_vt/discovery.py b/avocado_vt/discovery.py index 60ffa1acb0..e479e859ac 100644 --- a/avocado_vt/discovery.py +++ b/avocado_vt/discovery.py @@ -18,6 +18,7 @@ """ from virttest.compat import get_opt + from .options import VirtTestOptionsProcess diff --git a/avocado_vt/loader.py b/avocado_vt/loader.py index 32bb2ec87f..cbdc27ce7c 100644 --- a/avocado_vt/loader.py +++ b/avocado_vt/loader.py @@ -22,10 +22,7 @@ from avocado.core import output -from virttest import cartesian_config -from virttest import data_dir -from virttest import standalone_test -from virttest import storage +from virttest import cartesian_config, data_dir, standalone_test, storage from virttest.compat import get_opt, set_opt from .discovery import DiscoveryMixIn diff --git a/avocado_vt/options.py b/avocado_vt/options.py index 6412f798b0..01795242ba 100644 --- a/avocado_vt/options.py +++ b/avocado_vt/options.py @@ -21,18 +21,16 @@ from avocado.utils import path as utils_path -from virttest import cartesian_config -from virttest import data_dir -from virttest import defaults -from virttest import standalone_test +from virttest import cartesian_config, data_dir, defaults, standalone_test from virttest.compat import get_opt, set_opt, set_opt_from_settings -from virttest.standalone_test import SUPPORTED_DISK_BUSES -from virttest.standalone_test import SUPPORTED_IMAGE_TYPES -from virttest.standalone_test import SUPPORTED_LIBVIRT_DRIVERS -from virttest.standalone_test import SUPPORTED_NET_TYPES -from virttest.standalone_test import SUPPORTED_NIC_MODELS -from virttest.standalone_test import SUPPORTED_TEST_TYPES - +from virttest.standalone_test import ( + SUPPORTED_DISK_BUSES, + SUPPORTED_IMAGE_TYPES, + SUPPORTED_LIBVIRT_DRIVERS, + SUPPORTED_NET_TYPES, + SUPPORTED_NIC_MODELS, + SUPPORTED_TEST_TYPES, +) LOG = logging.getLogger("avocado.vt.options") diff --git a/avocado_vt/plugins/vt.py b/avocado_vt/plugins/vt.py index 06bffd99d2..922e25d33d 100644 --- a/avocado_vt/plugins/vt.py +++ b/avocado_vt/plugins/vt.py @@ -22,12 +22,12 @@ from avocado.utils import path as utils_path from virttest import data_dir, defaults, standalone_test -from virttest.compat import get_settings_value, add_option +from virttest.compat import add_option, get_settings_value from virttest.standalone_test import SUPPORTED_LIBVIRT_URIS, SUPPORTED_TEST_TYPES - try: from avocado.core.loader import loader + from ..loader import VirtTestLoader AVOCADO_LOADER_AVAILABLE = True diff --git a/avocado_vt/plugins/vt_bootstrap.py b/avocado_vt/plugins/vt_bootstrap.py index 6f034e265d..b985382bef 100644 --- a/avocado_vt/plugins/vt_bootstrap.py +++ b/avocado_vt/plugins/vt_bootstrap.py @@ -12,14 +12,13 @@ # Copyright: Red Hat Inc. 2015 # Author: Lucas Meneghel Rodrigues -import sys import logging +import sys -from avocado.utils import process from avocado.core.plugin_interfaces import CLICmd +from avocado.utils import process -from virttest import bootstrap -from virttest import defaults +from virttest import bootstrap, defaults from virttest.standalone_test import SUPPORTED_TEST_TYPES LOG = logging.getLogger("avocado.app") diff --git a/avocado_vt/plugins/vt_joblock.py b/avocado_vt/plugins/vt_joblock.py index eeab55f7f9..b42b2d9992 100644 --- a/avocado_vt/plugins/vt_joblock.py +++ b/avocado_vt/plugins/vt_joblock.py @@ -1,23 +1,21 @@ import errno import logging import os -import re import random +import re import string import sys from avocado.core import exit_codes +from avocado.core.plugin_interfaces import JobPostTests as Post +from avocado.core.plugin_interfaces import JobPreTests as Pre from avocado.utils.process import pid_exists from avocado.utils.stacktrace import log_exc_info - -from avocado.core.plugin_interfaces import JobPreTests as Pre -from avocado.core.plugin_interfaces import JobPostTests as Post - -from ..test import VirtTest +from six.moves import xrange from virttest.compat import get_settings_value -from six.moves import xrange +from ..test import VirtTest class LockCreationError(Exception): diff --git a/avocado_vt/plugins/vt_list.py b/avocado_vt/plugins/vt_list.py index a24d434f8d..2e5a59600b 100644 --- a/avocado_vt/plugins/vt_list.py +++ b/avocado_vt/plugins/vt_list.py @@ -21,12 +21,14 @@ from avocado.core.plugin_interfaces import CLI -from virttest.compat import get_settings_value, add_option -from .vt import add_basic_vt_options, add_qemu_bin_vt_option from virttest._wrappers import load_source +from virttest.compat import add_option, get_settings_value + +from .vt import add_basic_vt_options, add_qemu_bin_vt_option try: from avocado.core.loader import loader + from ..loader import VirtTestLoader AVOCADO_LOADER_AVAILABLE = True @@ -70,7 +72,6 @@ from virttest import data_dir # pylint: disable=C0413 - _PROVIDERS_DOWNLOAD_DIR = os.path.join(data_dir.get_test_providers_dir(), "downloads") try: diff --git a/avocado_vt/plugins/vt_list_archs.py b/avocado_vt/plugins/vt_list_archs.py index 1ee21ca8a8..04f24c05ca 100644 --- a/avocado_vt/plugins/vt_list_archs.py +++ b/avocado_vt/plugins/vt_list_archs.py @@ -1,4 +1,5 @@ from avocado.core.plugin_interfaces import CLICmd + from virttest.compat import add_option from virttest.standalone_test import get_guest_name_parser diff --git a/avocado_vt/plugins/vt_list_guests.py b/avocado_vt/plugins/vt_list_guests.py index 9194ae0a9b..9905f6812b 100644 --- a/avocado_vt/plugins/vt_list_guests.py +++ b/avocado_vt/plugins/vt_list_guests.py @@ -1,5 +1,6 @@ from avocado.core.plugin_interfaces import CLICmd from avocado.core.settings import settings + from virttest.compat import add_option, is_registering_settings_required from virttest.standalone_test import get_guest_name_parser diff --git a/avocado_vt/plugins/vt_runner.py b/avocado_vt/plugins/vt_runner.py index 49b68f047a..2319a6399a 100644 --- a/avocado_vt/plugins/vt_runner.py +++ b/avocado_vt/plugins/vt_runner.py @@ -13,9 +13,9 @@ # the 92.0 support will be dropped. try: from avocado.core.nrunner import ( + RUNNER_RUN_CHECK_INTERVAL, BaseRunner, BaseRunnerApp, - RUNNER_RUN_CHECK_INTERVAL, ) from avocado.core.nrunner import main as nrunner_main from avocado.core.runners.utils import messages @@ -23,7 +23,7 @@ LTS = True except ImportError: from avocado.core.nrunner.app import BaseRunnerApp - from avocado.core.nrunner.runner import BaseRunner, RUNNER_RUN_CHECK_INTERVAL + from avocado.core.nrunner.runner import RUNNER_RUN_CHECK_INTERVAL, BaseRunner from avocado.core.utils import messages LTS = False diff --git a/avocado_vt/plugins/vt_settings.py b/avocado_vt/plugins/vt_settings.py index 070c957523..8c49c5bc7c 100644 --- a/avocado_vt/plugins/vt_settings.py +++ b/avocado_vt/plugins/vt_settings.py @@ -17,10 +17,9 @@ """ import os -from pkg_resources import resource_filename -from pkg_resources import resource_listdir from avocado.core.plugin_interfaces import Settings +from pkg_resources import resource_filename, resource_listdir class VTSettings(Settings): diff --git a/avocado_vt/test.py b/avocado_vt/test.py index 5cd145761b..71161f8f60 100644 --- a/avocado_vt/test.py +++ b/avocado_vt/test.py @@ -17,27 +17,25 @@ """ import os -import sys import shlex +import sys -from avocado.core import exceptions -from avocado.core import test -from avocado.utils import stacktrace -from avocado.utils import process - -from virttest import error_event -from virttest import data_dir -from virttest import env_process -from virttest import funcatexit -from virttest import utils_env -from virttest import utils_params -from virttest import utils_logfile -from virttest import utils_misc -from virttest import version -from virttest._wrappers import load_source +from avocado.core import exceptions, test +from avocado.utils import process, stacktrace from avocado_vt import utils - +from virttest import ( + data_dir, + env_process, + error_event, + funcatexit, + utils_env, + utils_logfile, + utils_misc, + utils_params, + version, +) +from virttest._wrappers import load_source # avocado-vt no longer needs autotest for the majority of its functionality, # except by: diff --git a/avocado_vt/utils.py b/avocado_vt/utils.py index 14ad79bfd9..07dd840909 100644 --- a/avocado_vt/utils.py +++ b/avocado_vt/utils.py @@ -21,8 +21,7 @@ from avocado.core import exceptions from avocado.utils import genio, stacktrace -from virttest import asset, bootstrap -from virttest import data_dir +from virttest import asset, bootstrap, data_dir from virttest._wrappers import import_module BG_ERR_FILE = "background-error.log" diff --git a/examples/tests/guest_hostname.py b/examples/tests/guest_hostname.py index b50b74acba..56dc309184 100644 --- a/examples/tests/guest_hostname.py +++ b/examples/tests/guest_hostname.py @@ -6,7 +6,6 @@ """ import logging - LOG = logging.getLogger("avocado.vt.examples.guest_hostname") diff --git a/examples/tests/hostname.py b/examples/tests/hostname.py index a987a6b1be..dc12015b27 100644 --- a/examples/tests/hostname.py +++ b/examples/tests/hostname.py @@ -10,7 +10,6 @@ from avocado.utils import process - LOG = logging.getLogger("avocado.vt.examples.hostname") diff --git a/examples/tests/ls_disk.py b/examples/tests/ls_disk.py index 116d38a4d5..c069afc5f7 100644 --- a/examples/tests/ls_disk.py +++ b/examples/tests/ls_disk.py @@ -14,7 +14,6 @@ """ import logging - LOG = logging.getLogger("avocado.vt.examples.lsdisk") diff --git a/examples/tests/service.py b/examples/tests/service.py index 0142a04d40..061d31c1d4 100644 --- a/examples/tests/service.py +++ b/examples/tests/service.py @@ -9,13 +9,11 @@ import logging import time -from avocado.utils import process from avocado.core import exceptions +from avocado.utils import process from avocado.utils.service import SpecificServiceManager -from virttest import remote -from virttest import error_context - +from virttest import error_context, remote LOG = logging.getLogger("avocado.vt.examples.service") diff --git a/examples/tests/template.py b/examples/tests/template.py index be2b0f94bf..3b29da98ee 100644 --- a/examples/tests/template.py +++ b/examples/tests/template.py @@ -3,7 +3,6 @@ # $ avocado run template --vt-type qemu to execute it. import logging - LOG = logging.getLogger("avocado.test") diff --git a/requirements-travis.txt b/requirements-travis.txt index 8b8c89c0e9..e08c76d8fc 100644 --- a/requirements-travis.txt +++ b/requirements-travis.txt @@ -6,3 +6,4 @@ aexpect>=1.6.4 netifaces==0.11.0 pyenchant==3.2.2 black==22.3.0 +isort==5.10.1 diff --git a/scripts/cd_hash.py b/scripts/cd_hash.py index ca9b05aa9f..ea06792e5e 100755 --- a/scripts/cd_hash.py +++ b/scripts/cd_hash.py @@ -5,16 +5,14 @@ :copyright: Red Hat 2008-2009 """ -import os -import sys import logging import optparse +import os +import sys from avocado.utils import crypto - from logging_config import LoggingConfig - if __name__ == "__main__": log_cfg = LoggingConfig(set_fmt=False) log_cfg.configure_logging() diff --git a/scripts/download_manager.py b/scripts/download_manager.py index 654afd3eed..2f27683471 100755 --- a/scripts/download_manager.py +++ b/scripts/download_manager.py @@ -18,24 +18,20 @@ :copyright: Red Hat 2012 """ -import sys -import os import logging +import os +import sys # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) -from virttest import asset - from avocado.core.output import TERM_SUPPORT - from logging_config import LoggingConfig +from six.moves import input, urllib - -from six.moves import input -from six.moves import urllib +from virttest import asset def download_assets(): diff --git a/scripts/github/cache_populate.py b/scripts/github/cache_populate.py index 8c78bef8d8..3e1908ef8d 100755 --- a/scripts/github/cache_populate.py +++ b/scripts/github/cache_populate.py @@ -1,15 +1,14 @@ #!/usr/bin/env python from __future__ import print_function -import sys + import getpass +import sys from github import Github from github_issues import GithubIssues - from six.moves import input - gh = Github( login_or_token=input("Enter github username: "), password=getpass.getpass("Enter github password: "), diff --git a/scripts/github/example.py b/scripts/github/example.py index e7e4bc3de5..8d810fe041 100755 --- a/scripts/github/example.py +++ b/scripts/github/example.py @@ -1,13 +1,14 @@ #!/usr/bin/env python from __future__ import print_function -import sys -import getpass + import datetime +import getpass +import sys # PyGithub >= 1.13 is required https://pypi.python.org/pypi/PyGithub from github import Github -from github_issues import GithubIssuesBase, GithubIssues +from github_issues import GithubIssues, GithubIssuesBase # You could use OAuth here too for unattended access # see http://developer.github.com/v3/oauth/#create-a-new-authorization diff --git a/scripts/github/github_issues.py b/scripts/github/github_issues.py index d65dcb4f67..7ceaa42cf8 100644 --- a/scripts/github/github_issues.py +++ b/scripts/github/github_issues.py @@ -2,14 +2,13 @@ Classes to cache and read specific items from github issues in a uniform way """ -from functools import partial as Partial import datetime -import time import shelve +import time +from functools import partial as Partial # Requires PyGithub version >= 1.13 for access to raw_data attribute import github - from six.moves import xrange diff --git a/scripts/github/label_issues.py b/scripts/github/label_issues.py index 4681b7adda..41f181ab1b 100755 --- a/scripts/github/label_issues.py +++ b/scripts/github/label_issues.py @@ -1,12 +1,11 @@ #!/usr/bin/env python from __future__ import print_function + import getpass from github import Github from github_issues import GithubIssues, MutableIssue - - from six.moves import input diff --git a/scripts/github/pulls_applied.py b/scripts/github/pulls_applied.py index 820acefaa9..da9017bc67 100755 --- a/scripts/github/pulls_applied.py +++ b/scripts/github/pulls_applied.py @@ -1,15 +1,14 @@ #!/usr/bin/env python from __future__ import print_function -import getpass + import datetime +import getpass from github import Github from github_issues import GithubIssues - from six.moves import input - gh = Github( login_or_token=input("Enter github username: "), password=getpass.getpass("Enter github password: "), diff --git a/scripts/github/stale_pulls.py b/scripts/github/stale_pulls.py index 2d8f830f2e..9922cff405 100755 --- a/scripts/github/stale_pulls.py +++ b/scripts/github/stale_pulls.py @@ -1,15 +1,14 @@ #!/usr/bin/env python -from __future__ import print_function, division -import getpass +from __future__ import division, print_function + import datetime +import getpass from github import Github from github_issues import GithubIssues - from six.moves import input - gh = Github( login_or_token=input("Enter github username: "), password=getpass.getpass("Enter github password: "), diff --git a/scripts/github/unassigned_issues.py b/scripts/github/unassigned_issues.py index 6245a65b9f..8cc8645d8f 100755 --- a/scripts/github/unassigned_issues.py +++ b/scripts/github/unassigned_issues.py @@ -1,14 +1,13 @@ #!/usr/bin/env python from __future__ import print_function + import getpass from github import Github from github_issues import GithubIssues - from six.moves import input - gh = Github( login_or_token=input("Enter github username: "), password=getpass.getpass("Enter github password: "), diff --git a/scripts/koji_pkgspec.py b/scripts/koji_pkgspec.py index 626d77b350..f3f8403193 100755 --- a/scripts/koji_pkgspec.py +++ b/scripts/koji_pkgspec.py @@ -8,9 +8,9 @@ will match the packages you intended to install. """ -import sys import optparse import os +import sys # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/scripts/package_jeos.py b/scripts/package_jeos.py index 476e054555..700ee9f252 100755 --- a/scripts/package_jeos.py +++ b/scripts/package_jeos.py @@ -1,13 +1,12 @@ #!/usr/bin/python -import os -import sys import logging +import os import shutil +import sys from avocado.utils import process - # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): diff --git a/scripts/regression.py b/scripts/regression.py index fd64154c30..b270c1ca56 100755 --- a/scripts/regression.py +++ b/scripts/regression.py @@ -7,9 +7,10 @@ :author: Amos Kong """ from __future__ import division + import os -import sys import re +import sys import warnings try: @@ -243,8 +244,8 @@ def getTtestPvalue(self, fs_dict1, fs_dict2, paired=None, ratio=None): t-test: http://en.wikipedia.org/wiki/Student's_t-test """ try: - from scipy import stats import numpy as np + from scipy import stats except ImportError: print("No python scipy/numpy library installed!") return None diff --git a/scripts/scan_results.py b/scripts/scan_results.py index e8f08b5859..3420b8fec9 100755 --- a/scripts/scan_results.py +++ b/scripts/scan_results.py @@ -5,15 +5,15 @@ """ from __future__ import division + +import argparse import os -import sys import sqlite3 -import argparse +import sys +import six from avocado.core import data_dir from dateutil import parser as dateparser - -import six from six.moves import xrange diff --git a/scripts/tapfd_helper.py b/scripts/tapfd_helper.py index b640b087bc..2401d57970 100755 --- a/scripts/tapfd_helper.py +++ b/scripts/tapfd_helper.py @@ -1,8 +1,8 @@ #!/usr/bin/python -import sys import os import re +import sys # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/scripts/virt_disk.py b/scripts/virt_disk.py index a5fdcd5f3a..6cc65c12a8 100755 --- a/scripts/virt_disk.py +++ b/scripts/virt_disk.py @@ -8,9 +8,9 @@ disks just like they're created by the virt unattended test installation. """ -import sys import optparse import os +import sys # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/selftests/doc/test_doc_build.py b/selftests/doc/test_doc_build.py index d390d4e16e..d94493b6fc 100644 --- a/selftests/doc/test_doc_build.py +++ b/selftests/doc/test_doc_build.py @@ -8,7 +8,6 @@ from avocado.utils import process - basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..") basedir = os.path.abspath(basedir) diff --git a/selftests/functional/test_basic.py b/selftests/functional/test_basic.py index 499222eb49..b7cb2e83ca 100644 --- a/selftests/functional/test_basic.py +++ b/selftests/functional/test_basic.py @@ -4,10 +4,9 @@ import tempfile import unittest -from avocado.utils import process -from avocado.utils import script -from virttest import data_dir +from avocado.utils import process, script +from virttest import data_dir BASE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..") BASE_DIR = os.path.abspath(BASE_DIR) diff --git a/selftests/isort.sh b/selftests/isort.sh new file mode 100755 index 0000000000..c257898c87 --- /dev/null +++ b/selftests/isort.sh @@ -0,0 +1,3 @@ +#!/bin/sh -e + +isort --check-only --profile black . diff --git a/selftests/run b/selftests/run index 68c699c537..695a10c72b 100755 --- a/selftests/run +++ b/selftests/run @@ -3,10 +3,9 @@ __author__ = 'Lucas Meneghel Rodrigues ' +import logging import os import sys -import logging - if sys.version_info[:2] == (2, 6): import unittest2 as unittest diff --git a/selftests/unit/test_cartesian_config.py b/selftests/unit/test_cartesian_config.py index c962dcd978..010ec73407 100644 --- a/selftests/unit/test_cartesian_config.py +++ b/selftests/unit/test_cartesian_config.py @@ -1,9 +1,9 @@ #!/usr/bin/python -import unittest -import os import gzip +import os import sys +import unittest # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -12,7 +12,6 @@ from virttest import cartesian_config - mydir = os.path.dirname(__file__) testdatadir = os.path.join(mydir, "unittest_data") diff --git a/selftests/unit/test_cartesian_config_lint.py b/selftests/unit/test_cartesian_config_lint.py index 7a63a1cefc..2cd5a93f30 100644 --- a/selftests/unit/test_cartesian_config_lint.py +++ b/selftests/unit/test_cartesian_config_lint.py @@ -10,7 +10,6 @@ from virttest import cartesian_config - BASEDIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) RHELDIR = os.path.join(BASEDIR, "shared", "cfg", "guest-os", "Linux", "RHEL") UNATTENDEDDIR = os.path.join(BASEDIR, "shared", "unattended") diff --git a/selftests/unit/test_installer.py b/selftests/unit/test_installer.py index 71309313f6..9199a6c8bb 100644 --- a/selftests/unit/test_installer.py +++ b/selftests/unit/test_installer.py @@ -1,16 +1,15 @@ #!/usr/bin/python -import unittest import os import sys +import unittest # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) -from virttest import installer -from virttest import cartesian_config +from virttest import cartesian_config, installer class installer_test(unittest.TestCase): diff --git a/selftests/unit/test_iscsi.py b/selftests/unit/test_iscsi.py index 9d65dd278f..696f195dcb 100644 --- a/selftests/unit/test_iscsi.py +++ b/selftests/unit/test_iscsi.py @@ -1,20 +1,17 @@ #!/usr/bin/python -import unittest import os import sys +import unittest -from avocado.utils import path -from avocado.utils import process - +from avocado.utils import path, process # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) +from virttest import iscsi, utils_selinux from virttest.unittest_utils import mock -from virttest import iscsi -from virttest import utils_selinux class iscsi_test(unittest.TestCase): diff --git a/selftests/unit/test_libvirt_network.py b/selftests/unit/test_libvirt_network.py index 957fc0c1a6..96b76d32e2 100644 --- a/selftests/unit/test_libvirt_network.py +++ b/selftests/unit/test_libvirt_network.py @@ -2,20 +2,20 @@ """ Unit tests for Manipulator classes in libvirt_xml module. """ -import unittest +import itertools import os import sys -import itertools +import unittest from avocado.utils.process import CmdResult - # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) from test_virsh import FakeVirshFactory + from virttest.libvirt_xml.network_xml import NetworkXML # The output of virsh.net_list with only default net diff --git a/selftests/unit/test_libvirt_storage.py b/selftests/unit/test_libvirt_storage.py index edcfb0aad1..38e8e9aae3 100644 --- a/selftests/unit/test_libvirt_storage.py +++ b/selftests/unit/test_libvirt_storage.py @@ -1,19 +1,19 @@ #!/usr/bin/python -import unittest import os import sys +import unittest from avocado.utils.process import CmdResult - # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) -from virttest import libvirt_storage from test_virsh import FakeVirshFactory +from virttest import libvirt_storage + # The output of virsh.pool_list with only default pool _DEFAULT_POOL = ( "Name State Autostart\n" diff --git a/selftests/unit/test_libvirt_xml.py b/selftests/unit/test_libvirt_xml.py index ab897978c0..f77255336d 100644 --- a/selftests/unit/test_libvirt_xml.py +++ b/selftests/unit/test_libvirt_xml.py @@ -1,16 +1,14 @@ #!/usr/bin/python -import unittest +import logging import os import shutil -import logging import sys +import unittest import six - from avocado.utils import process - try: unicode except NameError: @@ -22,14 +20,21 @@ if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) -from virttest import xml_utils, utils_misc, data_dir -from virttest.libvirt_xml import accessors, vm_xml, xcepts, network_xml, base -from virttest.libvirt_xml import nodedev_xml -from virttest.libvirt_xml.devices import librarian -from virttest.libvirt_xml.devices import base as devices_base -from virttest.libvirt_xml import capability_xml from test_virsh import FakeVirshFactory +from virttest import data_dir, utils_misc, xml_utils +from virttest.libvirt_xml import ( + accessors, + base, + capability_xml, + network_xml, + nodedev_xml, + vm_xml, + xcepts, +) +from virttest.libvirt_xml.devices import base as devices_base +from virttest.libvirt_xml.devices import librarian + # save a copy ORIGINAL_DEVICE_TYPES = list(librarian.DEVICE_TYPES) UUID = "8109c109-1551-cb11-8e2c-bc43745252ef" diff --git a/selftests/unit/test_nfs.py b/selftests/unit/test_nfs.py index c3e3492bbe..2b8e08ba75 100644 --- a/selftests/unit/test_nfs.py +++ b/selftests/unit/test_nfs.py @@ -1,21 +1,18 @@ #!/usr/bin/python -import unittest import os import sys +import unittest -from avocado.utils import path -from avocado.utils import process - +from avocado.utils import path, process # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) -from virttest.unittest_utils import mock -from virttest import nfs -from virttest import utils_misc +from virttest import nfs, utils_misc from virttest.staging import service +from virttest.unittest_utils import mock class FakeService(object): diff --git a/selftests/unit/test_propcan.py b/selftests/unit/test_propcan.py index 32bdd003f4..cd0294a1f9 100644 --- a/selftests/unit/test_propcan.py +++ b/selftests/unit/test_propcan.py @@ -1,8 +1,8 @@ #!/usr/bin/python -import unittest import logging import os import sys +import unittest # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/selftests/unit/test_qemu_devices.py b/selftests/unit/test_qemu_devices.py index 87d6e42e49..4437e4b9d6 100644 --- a/selftests/unit/test_qemu_devices.py +++ b/selftests/unit/test_qemu_devices.py @@ -7,23 +7,22 @@ """ __author__ = """Lukas Doktor (ldoktor@redhat.com)""" -import re -import unittest import os +import re import sys +import unittest # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) -from virttest.unittest_utils import mock -from virttest.qemu_devices import qdevices, qcontainer -from virttest import qemu_monitor - import six from six.moves import xrange +from virttest import qemu_monitor +from virttest.qemu_devices import qcontainer, qdevices +from virttest.unittest_utils import mock UNITTEST_DATA_DIR = os.path.join( os.path.dirname(os.path.abspath(__file__)), "unittest_data" diff --git a/selftests/unit/test_qemu_monitor.py b/selftests/unit/test_qemu_monitor.py index 178adf6b78..5392d856e9 100644 --- a/selftests/unit/test_qemu_monitor.py +++ b/selftests/unit/test_qemu_monitor.py @@ -1,18 +1,18 @@ #!/usr/bin/python -import unittest import os import sys +import unittest # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) -from virttest import qemu_monitor - import six +from virttest import qemu_monitor + class MockMonitor(qemu_monitor.Monitor): diff --git a/selftests/unit/test_qemu_qtree.py b/selftests/unit/test_qemu_qtree.py index fd4797f90c..8033e4eef5 100644 --- a/selftests/unit/test_qemu_qtree.py +++ b/selftests/unit/test_qemu_qtree.py @@ -7,21 +7,20 @@ """ __author__ = """Lukas Doktor (ldoktor@redhat.com)""" -import unittest import os import sys +import unittest # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) -from virttest.unittest_utils import mock -from virttest import qemu_qtree - import six from six.moves import xrange +from virttest import qemu_qtree +from virttest.unittest_utils import mock OFFSET_PER_LEVEL = qemu_qtree.OFFSET_PER_LEVEL diff --git a/selftests/unit/test_remote.py b/selftests/unit/test_remote.py index 26437d02ad..1c322c9f57 100644 --- a/selftests/unit/test_remote.py +++ b/selftests/unit/test_remote.py @@ -1,16 +1,15 @@ #!/usr/bin/python -import unittest import os import sys +import unittest # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) -from virttest import remote -from virttest import data_dir +from virttest import data_dir, remote class RemoteFileTest(unittest.TestCase): diff --git a/selftests/unit/test_setup_networking.py b/selftests/unit/test_setup_networking.py index bfcc2d9b44..52e1a22a5f 100644 --- a/selftests/unit/test_setup_networking.py +++ b/selftests/unit/test_setup_networking.py @@ -1,8 +1,8 @@ import unittest from unittest.mock import Mock, patch +from virttest.test_setup.networking import BridgeConfig, NetworkProxies from virttest.utils_params import Params -from virttest.test_setup.networking import NetworkProxies, BridgeConfig class TestProxySetuper(unittest.TestCase): diff --git a/selftests/unit/test_utils_cgroup.py b/selftests/unit/test_utils_cgroup.py index 0953b450c4..2b135e2950 100644 --- a/selftests/unit/test_utils_cgroup.py +++ b/selftests/unit/test_utils_cgroup.py @@ -1,13 +1,12 @@ #!/usr/bin/env python import os -import unittest -import tempfile import sys +import tempfile +import unittest from avocado.core import exceptions - # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): diff --git a/selftests/unit/test_utils_config.py b/selftests/unit/test_utils_config.py index edba5938c9..b2d907ed6c 100644 --- a/selftests/unit/test_utils_config.py +++ b/selftests/unit/test_utils_config.py @@ -1,8 +1,8 @@ #!/usr/bin/env python import os -import tempfile import sys +import tempfile if sys.version_info[:2] == (2, 6): import unittest2 as unittest diff --git a/selftests/unit/test_utils_env.py b/selftests/unit/test_utils_env.py index 40983c48d4..65bafdad05 100644 --- a/selftests/unit/test_utils_env.py +++ b/selftests/unit/test_utils_env.py @@ -1,19 +1,17 @@ #!/usr/bin/python -import unittest -import time import logging import os -import threading import sys +import threading +import time +import unittest # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) -from virttest import utils_env -from virttest import utils_params -from virttest import utils_misc +from virttest import utils_env, utils_misc, utils_params class FakeVm(object): diff --git a/selftests/unit/test_utils_libguestfs.py b/selftests/unit/test_utils_libguestfs.py index a37b086077..aa0f51f142 100644 --- a/selftests/unit/test_utils_libguestfs.py +++ b/selftests/unit/test_utils_libguestfs.py @@ -1,12 +1,11 @@ #!/usr/bin/python -import unittest import logging import os import sys +import unittest from avocado.utils import path - # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): diff --git a/selftests/unit/test_utils_misc.py b/selftests/unit/test_utils_misc.py index 683bc4a804..ec51ac5362 100644 --- a/selftests/unit/test_utils_misc.py +++ b/selftests/unit/test_utils_misc.py @@ -1,22 +1,19 @@ #!/usr/bin/python import os +import sys import tempfile import unittest -import sys from avocado.utils import process - # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) +from virttest import build_helper, cartesian_config, utils_misc from virttest.unittest_utils import mock -from virttest import utils_misc -from virttest import cartesian_config -from virttest import build_helper class TestUtilsMisc(unittest.TestCase): diff --git a/selftests/unit/test_utils_net.py b/selftests/unit/test_utils_net.py index a17d6fe9d1..40ce32045f 100644 --- a/selftests/unit/test_utils_net.py +++ b/selftests/unit/test_utils_net.py @@ -1,31 +1,25 @@ #!/usr/bin/python from __future__ import division -import unittest -import time + import logging -import sys -import random import os +import random import shelve +import sys +import time +import unittest from avocado.utils import process - from six.moves import xrange - # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): sys.path.append(basedir) +from virttest import cartesian_config, propcan, utils_misc, utils_net, utils_params from virttest.unittest_utils import mock -from virttest import utils_net -from virttest import utils_misc -from virttest import cartesian_config -from virttest import utils_params -from virttest import propcan - # Disable some pylint checks for selftests # pylint: disable=E1133,E1136 diff --git a/selftests/unit/test_utils_params.py b/selftests/unit/test_utils_params.py index 4ee2b1ba0f..5d2678ed2a 100644 --- a/selftests/unit/test_utils_params.py +++ b/selftests/unit/test_utils_params.py @@ -1,8 +1,8 @@ #!/usr/bin/python -import unittest import os import sys +import unittest from collections import OrderedDict # simple magic for using scripts within a source tree diff --git a/selftests/unit/test_versionable_class.py b/selftests/unit/test_versionable_class.py index 37770be3bf..07f9572cf9 100644 --- a/selftests/unit/test_versionable_class.py +++ b/selftests/unit/test_versionable_class.py @@ -1,8 +1,8 @@ #!/usr/bin/python -import unittest import os import sys +import unittest try: import pickle as cPickle @@ -15,7 +15,7 @@ sys.path.append(basedir) from virttest.unittest_utils import mock -from virttest.versionable_class import Manager, factory, VersionableClass +from virttest.versionable_class import Manager, VersionableClass, factory man = Manager(__name__) diff --git a/selftests/unit/test_virsh.py b/selftests/unit/test_virsh.py index b0b4d72698..3067b0f606 100644 --- a/selftests/unit/test_virsh.py +++ b/selftests/unit/test_virsh.py @@ -1,13 +1,12 @@ #!/usr/bin/python -import unittest import logging import os import sys +import unittest from avocado.utils import process - # simple magic for using scripts within a source tree basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if os.path.isdir(os.path.join(basedir, "virttest")): diff --git a/selftests/unit/test_wrappers.py b/selftests/unit/test_wrappers.py index c136a3642d..cd258e1999 100644 --- a/selftests/unit/test_wrappers.py +++ b/selftests/unit/test_wrappers.py @@ -1,13 +1,12 @@ import os +import random import sys import unittest -import random -from string import ascii_lowercase as ascii_lc - -from time import sleep -from copy import deepcopy from abc import ABC from concurrent.futures import ThreadPoolExecutor, wait +from copy import deepcopy +from string import ascii_lowercase as ascii_lc +from time import sleep from virttest import _wrappers diff --git a/selftests/unit/test_xml_utils.py b/selftests/unit/test_xml_utils.py index aaf0aaa126..275ea0e7a4 100644 --- a/selftests/unit/test_xml_utils.py +++ b/selftests/unit/test_xml_utils.py @@ -1,11 +1,11 @@ #!/usr/bin/python -import unittest -import tempfile -import os import glob import logging +import os import sys +import tempfile +import unittest from xml.etree import ElementTree # simple magic for using scripts within a source tree diff --git a/setup.py b/setup.py index 1af2ab63aa..eb21f7869f 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,8 @@ import shutil from distutils.command.clean import clean from pathlib import Path -from setuptools import setup, find_packages + +from setuptools import find_packages, setup VERSION = open("VERSION", "r").read().strip() diff --git a/virttest/_wrappers.py b/virttest/_wrappers.py index d1e749f2e2..21a1c00ed1 100644 --- a/virttest/_wrappers.py +++ b/virttest/_wrappers.py @@ -4,19 +4,18 @@ Please, use this module ONLY from other virttest/avocado-vt modules. """ -import sys import importlib import importlib.util +import sys from importlib.machinery import ( - SourceFileLoader, - SOURCE_SUFFIXES, - SourcelessFileLoader, BYTECODE_SUFFIXES, - ExtensionFileLoader, EXTENSION_SUFFIXES, + SOURCE_SUFFIXES, + ExtensionFileLoader, + SourceFileLoader, + SourcelessFileLoader, ) - _LOADERS = ( (SourceFileLoader, SOURCE_SUFFIXES), (SourcelessFileLoader, BYTECODE_SUFFIXES), diff --git a/virttest/asset.py b/virttest/asset.py index eba60acb13..494ae07ce7 100644 --- a/virttest/asset.py +++ b/virttest/asset.py @@ -1,8 +1,9 @@ +import glob import logging import os import re -import glob import shutil + from six import StringIO try: @@ -10,15 +11,9 @@ except ImportError: import ConfigParser -from avocado.utils import astring -from avocado.utils import process -from avocado.utils import genio -from avocado.utils import crypto -from avocado.utils import download -from avocado.utils import git - -from six.moves import urllib +from avocado.utils import astring, crypto, download, genio, git, process from six import string_types +from six.moves import urllib from virttest import data_dir diff --git a/virttest/base_installer.py b/virttest/base_installer.py index 19d4386212..568017a957 100644 --- a/virttest/base_installer.py +++ b/virttest/base_installer.py @@ -6,18 +6,13 @@ custom logic for each virtualization hypervisor/software. """ -import os import logging +import os from avocado.core import exceptions -from avocado.utils import process -from avocado.utils import path -from avocado.utils import linux_modules - -from . import build_helper -from . import utils_misc -from . import yumrepo -from . import arch +from avocado.utils import linux_modules, path, process + +from . import arch, build_helper, utils_misc, yumrepo from .staging import utils_koji LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/bootstrap.py b/virttest/bootstrap.py index 8c3395a437..581434eca7 100644 --- a/virttest/bootstrap.py +++ b/virttest/bootstrap.py @@ -1,27 +1,18 @@ -from distutils import dir_util # virtualenv problem pylint: disable=E0611 +import glob import logging import os -import glob +import re import shutil import sys -import re +from distutils import dir_util # virtualenv problem pylint: disable=E0611 -from avocado.utils import cpu -from avocado.utils import distro -from avocado.utils import genio -from avocado.utils import linux_modules +from avocado.utils import cpu, distro, genio, linux_modules from avocado.utils import path as utils_path from avocado.utils import process -from . import data_dir -from . import asset -from . import cartesian_config -from . import utils_selinux -from . import defaults -from . import arch +from . import arch, asset, cartesian_config, data_dir, defaults, utils_selinux from .compat import get_opt - LOG = logging.getLogger("avocado.app") basic_program_requirements = ["xz", "tcpdump", "nc", "ip", "arping", "diff"] diff --git a/virttest/build_helper.py b/virttest/build_helper.py index 000cc22cdd..a72c635280 100644 --- a/virttest/build_helper.py +++ b/virttest/build_helper.py @@ -5,14 +5,10 @@ import tarfile from avocado.core import exceptions -from avocado.utils import download -from avocado.utils import git -from avocado.utils import path -from avocado.utils import process +from avocado.utils import download, git, path, process from virttest import data_dir - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/cartesian_config.py b/virttest/cartesian_config.py index 345d5e5d28..0a611cb796 100755 --- a/virttest/cartesian_config.py +++ b/virttest/cartesian_config.py @@ -132,10 +132,10 @@ :copyright: Red Hat 2008-2013 """ -import os import collections -import optparse import logging +import optparse +import os import re import sys diff --git a/virttest/ceph.py b/virttest/ceph.py index 57ef5d420b..202188c0ed 100644 --- a/virttest/ceph.py +++ b/virttest/ceph.py @@ -14,9 +14,7 @@ from avocado.utils import process -from virttest import utils_numeric -from virttest import error_context -from virttest import utils_misc +from virttest import error_context, utils_misc, utils_numeric LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/cpu.py b/virttest/cpu.py index ea4b5865f5..8326e0fe6d 100644 --- a/virttest/cpu.py +++ b/virttest/cpu.py @@ -15,25 +15,21 @@ # Author: Satheesh Rajendran -import re import json import logging +import os import platform +import re import time -import os import uuid import xml.etree.ElementTree as ET - +from avocado.core import exceptions from avocado.utils import cpu as utils +from avocado.utils import path, process from avocado.utils.software_manager import manager -from avocado.utils import process -from avocado.utils import path -from avocado.core import exceptions -from virttest import utils_misc -from virttest import libvirt_version -from virttest import data_dir +from virttest import data_dir, libvirt_version, utils_misc # lazy imports for dependencies that are not needed in all modes of use # (as the cpu module is generic to qemu vm use only, libvirt is optional) diff --git a/virttest/curl.py b/virttest/curl.py index cfe714579c..086b39366e 100644 --- a/virttest/curl.py +++ b/virttest/curl.py @@ -1,7 +1,7 @@ -from virttest import error_context - from avocado.utils import process +from virttest import error_context + @error_context.context_aware def get_image_filename( diff --git a/virttest/data_dir.py b/virttest/data_dir.py index e76b2fedba..87aed63f2e 100755 --- a/virttest/data_dir.py +++ b/virttest/data_dir.py @@ -2,23 +2,21 @@ """ Library used to provide the appropriate data dir for virt test. """ +import glob import inspect import logging import os -import glob import shutil import stat import pkg_resources - from avocado.core import data_dir from avocado.utils import distro from avocado.utils import path as utils_path +from six.moves import xrange from virttest.compat import get_settings_value -from six.moves import xrange - BASE_BACKEND_DIR = pkg_resources.resource_filename("virttest", "backends") TEST_PROVIDERS_DIR = pkg_resources.resource_filename("virttest", "test-providers.d") SHARED_DIR = pkg_resources.resource_filename("virttest", "shared") diff --git a/virttest/env_process.py b/virttest/env_process.py index ac3012d3fb..4ee27309d2 100644 --- a/virttest/env_process.py +++ b/virttest/env_process.py @@ -1,60 +1,59 @@ from __future__ import division + +import copy +import glob +import logging +import multiprocessing import os -import time import re -import logging -import glob -import threading import shutil import sys -import copy -import multiprocessing +import threading +import time import aexpect +import six from aexpect import remote - -from avocado.utils import process as a_process -from avocado.utils import crypto -from avocado.utils import path -from avocado.utils import distro -from avocado.utils import cpu as cpu_utils from avocado.core import exceptions from avocado.utils import archive - -import six +from avocado.utils import cpu as cpu_utils +from avocado.utils import crypto, distro, path +from avocado.utils import process as a_process from six.moves import xrange -from virttest import error_context -from virttest import qemu_monitor -from virttest import ppm_utils -from virttest import test_setup -from virttest import virt_vm -from virttest import utils_misc -from virttest import cpu -from virttest import storage -from virttest import utils_libguestfs -from virttest import qemu_storage -from virttest import data_dir -from virttest import utils_net -from virttest import nfs -from virttest import utils_test -from virttest import utils_iptables -from virttest import utils_package -from virttest import utils_qemu -from virttest import migration -from virttest import utils_kernel_module -from virttest import arch -from virttest import utils_logfile -from virttest.utils_conn import SSHConnection -from virttest.utils_version import VersionInterval -from virttest.staging import service -from virttest.test_setup.core import SetupManager -from virttest.test_setup.os_posix import UlimitConfig -from virttest.test_setup.networking import NetworkProxies, BridgeConfig -from virttest.test_setup.libvirt_setup import LibvirtdDebugLogConfig +from virttest import ( + arch, + cpu, + data_dir, + error_context, + migration, + nfs, + ppm_utils, + qemu_monitor, + qemu_storage, + storage, + test_setup, + utils_iptables, + utils_kernel_module, + utils_libguestfs, + utils_logfile, + utils_misc, + utils_net, + utils_package, + utils_qemu, + utils_test, + virt_vm, +) # lazy imports for dependencies that are not needed in all modes of use from virttest._wrappers import lazy_import +from virttest.staging import service +from virttest.test_setup.core import SetupManager +from virttest.test_setup.libvirt_setup import LibvirtdDebugLogConfig +from virttest.test_setup.networking import BridgeConfig, NetworkProxies +from virttest.test_setup.os_posix import UlimitConfig +from virttest.utils_conn import SSHConnection +from virttest.utils_version import VersionInterval utils_libvirtd = lazy_import("virttest.utils_libvirtd") virsh = lazy_import("virttest.virsh") diff --git a/virttest/funcatexit.py b/virttest/funcatexit.py index 9c669383eb..8fb791af59 100644 --- a/virttest/funcatexit.py +++ b/virttest/funcatexit.py @@ -8,9 +8,8 @@ import traceback -from avocado.core import exceptions - import six +from avocado.core import exceptions def run_exitfuncs(env, test_type): diff --git a/virttest/gluster.py b/virttest/gluster.py index 1e9004dc7e..642541102d 100644 --- a/virttest/gluster.py +++ b/virttest/gluster.py @@ -12,16 +12,11 @@ import re import socket -from avocado.utils import process -from avocado.utils import path as utils_path from avocado.core import exceptions +from avocado.utils import path as utils_path +from avocado.utils import process -from virttest import data_dir -from virttest import utils_disk -from virttest import remote -from virttest import utils_misc -from virttest import utils_net -from virttest import error_context +from virttest import data_dir, error_context, remote, utils_disk, utils_misc, utils_net LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/graphical_console.py b/virttest/graphical_console.py index 88f7b5621d..452f7dfebf 100644 --- a/virttest/graphical_console.py +++ b/virttest/graphical_console.py @@ -3,14 +3,13 @@ """ from __future__ import division -import time -import os + import csv import math +import os +import time -from virttest import data_dir -from virttest import ppm_utils - +from virttest import data_dir, ppm_utils _STR_DASH = "-" diff --git a/virttest/guest_agent.py b/virttest/guest_agent.py index 192fa1d7bb..b8088d74e1 100644 --- a/virttest/guest_agent.py +++ b/virttest/guest_agent.py @@ -4,21 +4,19 @@ :copyright: 2008-2012 Red Hat Inc. """ -import socket -import time -import logging -import random import base64 import json +import logging +import random +import socket +import time +import six from avocado.utils import process from virttest import error_context from virttest.qemu_monitor import Monitor, MonitorError - -import six - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/http_server.py b/virttest/http_server.py index de57dc7757..c3d10ba8a0 100644 --- a/virttest/http_server.py +++ b/virttest/http_server.py @@ -1,11 +1,12 @@ +import logging import os import posixpath -import logging try: from urllib.parse import unquote, urlparse except ImportError: from urllib import unquote + from urlparse import urlparse try: from http.server import HTTPServer, SimpleHTTPRequestHandler @@ -15,7 +16,6 @@ from avocado.utils.astring import to_text - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/installer.py b/virttest/installer.py index 45ec2c23f1..2c64335d78 100644 --- a/virttest/installer.py +++ b/virttest/installer.py @@ -8,9 +8,7 @@ from avocado.core import exceptions -from . import base_installer -from . import qemu_installer -from . import libvirt_installer +from . import base_installer, libvirt_installer, qemu_installer __all__ = [ "InstallerRegistry", diff --git a/virttest/ip_sniffing.py b/virttest/ip_sniffing.py index bcfdb6c40e..cf42f6d014 100644 --- a/virttest/ip_sniffing.py +++ b/virttest/ip_sniffing.py @@ -2,9 +2,9 @@ IP sniffing facilities """ -import threading import logging import re +import threading try: from collections import Iterable @@ -12,12 +12,11 @@ from collections.abc import Iterable import aexpect +import six from aexpect.remote import handle_prompts from avocado.utils import path as utils_path from avocado.utils import process -import six - from virttest.utils_logfile import log_line from virttest.utils_version import VersionInterval diff --git a/virttest/iscsi.py b/virttest/iscsi.py index 143368de3d..c56e35e686 100644 --- a/virttest/iscsi.py +++ b/virttest/iscsi.py @@ -8,20 +8,15 @@ """ from __future__ import division -import re -import os + import logging +import os +import re from avocado.core import exceptions -from avocado.utils import data_factory -from avocado.utils import process -from avocado.utils import path -from avocado.utils import distro - -from virttest import utils_selinux -from virttest import utils_net -from virttest import data_dir -from virttest import utils_package +from avocado.utils import data_factory, distro, path, process + +from virttest import data_dir, utils_net, utils_package, utils_selinux from virttest.staging import service LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/kernel_interface.py b/virttest/kernel_interface.py index f779670b47..b51d6d8e36 100644 --- a/virttest/kernel_interface.py +++ b/virttest/kernel_interface.py @@ -1,10 +1,9 @@ +import logging import os import re -import logging from avocado.utils import process - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/libvirt_cgroup.py b/virttest/libvirt_cgroup.py index cfe0d29a99..2fdc370658 100644 --- a/virttest/libvirt_cgroup.py +++ b/virttest/libvirt_cgroup.py @@ -3,14 +3,13 @@ :copyright: 2019 Red Hat Inc. """ -import os import logging +import os import re from avocado.utils import process -from virttest import utils_disk -from virttest import virsh +from virttest import utils_disk, virsh from virttest.staging import utils_cgroup VIRSH_BLKIOTUNE_OUTPUT_MAPPING = { diff --git a/virttest/libvirt_installer.py b/virttest/libvirt_installer.py index f54bd61be0..b31468e3aa 100644 --- a/virttest/libvirt_installer.py +++ b/virttest/libvirt_installer.py @@ -4,13 +4,13 @@ See BaseInstaller class in base_installer.py for interface details. """ +import logging import os import platform -import logging from avocado.utils import process -from virttest import base_installer +from virttest import base_installer __all__ = [ "GitRepoInstaller", diff --git a/virttest/libvirt_remote.py b/virttest/libvirt_remote.py index 8dfb2d9a39..615226dd04 100644 --- a/virttest/libvirt_remote.py +++ b/virttest/libvirt_remote.py @@ -7,10 +7,8 @@ from avocado.core import exceptions from virttest import remote - from virttest.utils_test import libvirt - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/libvirt_storage.py b/virttest/libvirt_storage.py index 77b7c5817a..c9c207c622 100644 --- a/virttest/libvirt_storage.py +++ b/virttest/libvirt_storage.py @@ -7,13 +7,12 @@ - class for storage pool operations """ -import re import logging +import re from avocado.utils import process -from virttest import storage -from virttest import virsh +from virttest import storage, virsh LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/libvirt_version.py b/virttest/libvirt_version.py index cd7b71de4b..b3a3653e77 100644 --- a/virttest/libvirt_version.py +++ b/virttest/libvirt_version.py @@ -2,15 +2,13 @@ Shared code for tests that need to get the libvirt version """ -import re import logging +import re from avocado.core import exceptions -from avocado.utils import path -from avocado.utils import process +from avocado.utils import path, process from avocado.utils.astring import to_text - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/libvirt_vm.py b/virttest/libvirt_vm.py index 451c3aa731..01a9d783d9 100644 --- a/virttest/libvirt_vm.py +++ b/virttest/libvirt_vm.py @@ -5,37 +5,37 @@ """ from __future__ import division -import time -import string -import os -import logging + import fcntl +import logging +import os +import platform import re import shutil +import string import tempfile -import platform +import time import aexpect from aexpect import remote - -from avocado.utils import process -from avocado.utils import crypto from avocado.core import exceptions - -from virttest import error_context -from virttest import utils_logfile -from virttest import utils_misc -from virttest import cpu -from virttest import virt_vm -from virttest import storage -from virttest import virsh -from virttest import libvirt_xml -from virttest import data_dir -from virttest import xml_utils -from virttest import utils_selinux -from virttest import test_setup -from virttest import utils_package - +from avocado.utils import crypto, process + +from virttest import ( + cpu, + data_dir, + error_context, + libvirt_xml, + storage, + test_setup, + utils_logfile, + utils_misc, + utils_package, + utils_selinux, + virsh, + virt_vm, + xml_utils, +) # Using as lower capital is not the best way to do, but this is just a # workaround to avoid changing the entire file. diff --git a/virttest/libvirt_xml/__init__.py b/virttest/libvirt_xml/__init__.py index 45bfd4fca2..6fa0bbddbb 100644 --- a/virttest/libvirt_xml/__init__.py +++ b/virttest/libvirt_xml/__init__.py @@ -35,21 +35,14 @@ class or instance attributes are needed (ousdie of __slots__) they must # These are the objects considered for common use: -# all exceptions are siblings of LibvirtXMLError -from virttest.libvirt_xml.xcepts import LibvirtXMLError - from virttest.libvirt_xml.capability_xml import CapabilityXML - -from virttest.libvirt_xml.network_xml import RangeList, IPXML, NetworkXML - -from virttest.libvirt_xml.vm_xml import VMXML - -from virttest.libvirt_xml.pool_xml import SourceXML, PoolXML - -from virttest.libvirt_xml.vol_xml import VolXML - +from virttest.libvirt_xml.network_xml import IPXML, NetworkXML, RangeList from virttest.libvirt_xml.nwfilter_xml import NwfilterXML - +from virttest.libvirt_xml.pool_xml import PoolXML, SourceXML +from virttest.libvirt_xml.snapshot_xml import SnapshotXML from virttest.libvirt_xml.sysinfo_xml import SysinfoXML +from virttest.libvirt_xml.vm_xml import VMXML +from virttest.libvirt_xml.vol_xml import VolXML -from virttest.libvirt_xml.snapshot_xml import SnapshotXML +# all exceptions are siblings of LibvirtXMLError +from virttest.libvirt_xml.xcepts import LibvirtXMLError diff --git a/virttest/libvirt_xml/accessors.py b/virttest/libvirt_xml/accessors.py index 253ef68c33..9b9b716bb7 100644 --- a/virttest/libvirt_xml/accessors.py +++ b/virttest/libvirt_xml/accessors.py @@ -3,12 +3,11 @@ """ import logging - from xml.etree.ElementTree import tostring from virttest import xml_utils +from virttest.libvirt_xml import base, xcepts from virttest.propcan import PropCanBase -from virttest.libvirt_xml import xcepts, base def type_check(name, thing, expected): diff --git a/virttest/libvirt_xml/backup_xml.py b/virttest/libvirt_xml/backup_xml.py index d2225183fe..443a804582 100644 --- a/virttest/libvirt_xml/backup_xml.py +++ b/virttest/libvirt_xml/backup_xml.py @@ -2,7 +2,7 @@ Module simplifying manipulation of XML described at http://libvirt.org/formatbackup.html """ -from virttest.libvirt_xml import base, accessors, xcepts +from virttest.libvirt_xml import accessors, base, xcepts class BackupXML(base.LibvirtXMLBase): diff --git a/virttest/libvirt_xml/base.py b/virttest/libvirt_xml/base.py index 1c05b254da..8bceaaf453 100644 --- a/virttest/libvirt_xml/base.py +++ b/virttest/libvirt_xml/base.py @@ -2,14 +2,13 @@ from avocado.utils import process -from .. import propcan, xml_utils -from ..libvirt_xml import xcepts -from .._wrappers import import_module - - # lazy imports for dependencies that are not needed in all modes of use from virttest._wrappers import lazy_import +from .. import propcan, xml_utils +from .._wrappers import import_module +from ..libvirt_xml import xcepts + virsh = lazy_import("virttest.virsh") diff --git a/virttest/libvirt_xml/capability_xml.py b/virttest/libvirt_xml/capability_xml.py index 85876ba142..0747507b84 100755 --- a/virttest/libvirt_xml/capability_xml.py +++ b/virttest/libvirt_xml/capability_xml.py @@ -4,7 +4,7 @@ """ from virttest import xml_utils -from virttest.libvirt_xml import base, accessors, xcepts +from virttest.libvirt_xml import accessors, base, xcepts class CapabilityXML(base.LibvirtXMLBase): diff --git a/virttest/libvirt_xml/checkpoint_xml.py b/virttest/libvirt_xml/checkpoint_xml.py index a09859b870..eaaf8ea879 100644 --- a/virttest/libvirt_xml/checkpoint_xml.py +++ b/virttest/libvirt_xml/checkpoint_xml.py @@ -2,7 +2,7 @@ Module simplifying manipulation of XML described at http://libvirt.org/formatdomaincheckpoint.html """ -from virttest.libvirt_xml import base, accessors +from virttest.libvirt_xml import accessors, base class CheckpointXML(base.LibvirtXMLBase): diff --git a/virttest/libvirt_xml/devices/base.py b/virttest/libvirt_xml/devices/base.py index 4d19effeff..a6db7c6daa 100644 --- a/virttest/libvirt_xml/devices/base.py +++ b/virttest/libvirt_xml/devices/base.py @@ -3,10 +3,11 @@ """ import logging + from six import StringIO from virttest import xml_utils -from virttest.libvirt_xml import base, xcepts, accessors +from virttest.libvirt_xml import accessors, base, xcepts from virttest.xml_utils import ElementTree diff --git a/virttest/libvirt_xml/devices/channel.py b/virttest/libvirt_xml/devices/channel.py index 7c24cb629b..8d5f7d9b70 100644 --- a/virttest/libvirt_xml/devices/channel.py +++ b/virttest/libvirt_xml/devices/channel.py @@ -4,8 +4,7 @@ http://libvirt.org/formatdomain.html#elementCharSerial """ -from virttest.libvirt_xml import base -from virttest.libvirt_xml import accessors +from virttest.libvirt_xml import accessors, base from virttest.libvirt_xml.devices.character import CharacterBase diff --git a/virttest/libvirt_xml/devices/character.py b/virttest/libvirt_xml/devices/character.py index 1b3fb419b9..d2b8bb8bd3 100644 --- a/virttest/libvirt_xml/devices/character.py +++ b/virttest/libvirt_xml/devices/character.py @@ -4,7 +4,7 @@ http://libvirt.org/formatdomain.html#elementCharSerial """ -from virttest.libvirt_xml import base, accessors, xcepts +from virttest.libvirt_xml import accessors, base, xcepts from virttest.libvirt_xml.devices import base from virttest.libvirt_xml.devices.seclabel import Seclabel diff --git a/virttest/libvirt_xml/devices/console.py b/virttest/libvirt_xml/devices/console.py index d9e34d3d23..a552401597 100644 --- a/virttest/libvirt_xml/devices/console.py +++ b/virttest/libvirt_xml/devices/console.py @@ -4,7 +4,7 @@ http://libvirt.org/formatdomain.html#elementCharSerial """ -from virttest.libvirt_xml import base, accessors +from virttest.libvirt_xml import accessors, base from virttest.libvirt_xml.devices.character import CharacterBase diff --git a/virttest/libvirt_xml/devices/filesystem.py b/virttest/libvirt_xml/devices/filesystem.py index f3acef972b..f0fbb22a02 100644 --- a/virttest/libvirt_xml/devices/filesystem.py +++ b/virttest/libvirt_xml/devices/filesystem.py @@ -4,8 +4,8 @@ https://libvirt.org/formatdomain.html#elementsFilesystem """ -from virttest.libvirt_xml.devices import base from virttest.libvirt_xml import accessors +from virttest.libvirt_xml.devices import base class Filesystem(base.TypedDeviceBase): diff --git a/virttest/libvirt_xml/devices/graphics.py b/virttest/libvirt_xml/devices/graphics.py index ae5609db5b..e71294dd11 100644 --- a/virttest/libvirt_xml/devices/graphics.py +++ b/virttest/libvirt_xml/devices/graphics.py @@ -4,9 +4,7 @@ http://libvirt.org/formatdomain.html#elementsGraphics """ -from virttest.libvirt_xml import accessors -from virttest.libvirt_xml import vm_xml -from virttest.libvirt_xml import xcepts +from virttest.libvirt_xml import accessors, vm_xml, xcepts from virttest.libvirt_xml.devices import base diff --git a/virttest/libvirt_xml/devices/hostdev.py b/virttest/libvirt_xml/devices/hostdev.py index cbcca4ef47..0c1480c2fd 100644 --- a/virttest/libvirt_xml/devices/hostdev.py +++ b/virttest/libvirt_xml/devices/hostdev.py @@ -4,8 +4,7 @@ http://libvirt.org/formatdomain.html#elementsHostDev """ from virttest.libvirt_xml import accessors -from virttest.libvirt_xml.devices import base -from virttest.libvirt_xml.devices import librarian +from virttest.libvirt_xml.devices import base, librarian class Hostdev(base.TypedDeviceBase): diff --git a/virttest/libvirt_xml/devices/interface.py b/virttest/libvirt_xml/devices/interface.py index a519a2a9a0..936ac73889 100644 --- a/virttest/libvirt_xml/devices/interface.py +++ b/virttest/libvirt_xml/devices/interface.py @@ -5,8 +5,7 @@ http://libvirt.org/formatnwfilter.html#nwfconceptsvars """ -from virttest.libvirt_xml import accessors -from virttest.libvirt_xml import xcepts +from virttest.libvirt_xml import accessors, xcepts from virttest.libvirt_xml.devices import base, librarian diff --git a/virttest/libvirt_xml/devices/lease.py b/virttest/libvirt_xml/devices/lease.py index 7b1ac440f8..2bff3869a5 100644 --- a/virttest/libvirt_xml/devices/lease.py +++ b/virttest/libvirt_xml/devices/lease.py @@ -4,8 +4,8 @@ http://libvirt.org/formatdomain.html#elementsLease """ -from virttest.libvirt_xml.devices import base from virttest.libvirt_xml import accessors +from virttest.libvirt_xml.devices import base class Lease(base.UntypedDeviceBase): diff --git a/virttest/libvirt_xml/devices/librarian.py b/virttest/libvirt_xml/devices/librarian.py index 12db5e9e6f..cd303b7741 100644 --- a/virttest/libvirt_xml/devices/librarian.py +++ b/virttest/libvirt_xml/devices/librarian.py @@ -6,7 +6,6 @@ from virttest.libvirt_xml import base - # Avoid accidental names like __init__, librarian, and/or other support modules DEVICE_TYPES = [ "disk", diff --git a/virttest/libvirt_xml/devices/memory.py b/virttest/libvirt_xml/devices/memory.py index b42277ec34..3400e8f481 100644 --- a/virttest/libvirt_xml/devices/memory.py +++ b/virttest/libvirt_xml/devices/memory.py @@ -4,8 +4,7 @@ """ from virttest.libvirt_xml import accessors -from virttest.libvirt_xml.devices import base -from virttest.libvirt_xml.devices import librarian +from virttest.libvirt_xml.devices import base, librarian class Memory(base.UntypedDeviceBase): diff --git a/virttest/libvirt_xml/devices/serial.py b/virttest/libvirt_xml/devices/serial.py index 281500ad89..d3dbf15b9d 100644 --- a/virttest/libvirt_xml/devices/serial.py +++ b/virttest/libvirt_xml/devices/serial.py @@ -4,7 +4,7 @@ http://libvirt.org/formatdomain.html#elementCharSerial """ -from virttest.libvirt_xml import base, accessors +from virttest.libvirt_xml import accessors, base from virttest.libvirt_xml.devices.character import CharacterBase diff --git a/virttest/libvirt_xml/devices/tpm.py b/virttest/libvirt_xml/devices/tpm.py index c4c617d383..13f52aafb4 100644 --- a/virttest/libvirt_xml/devices/tpm.py +++ b/virttest/libvirt_xml/devices/tpm.py @@ -6,9 +6,9 @@ import logging +from virttest import xml_utils from virttest.libvirt_xml import accessors from virttest.libvirt_xml.devices import base -from virttest import xml_utils LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/libvirt_xml/devices/watchdog.py b/virttest/libvirt_xml/devices/watchdog.py index b9668824e1..fdc569a8ca 100644 --- a/virttest/libvirt_xml/devices/watchdog.py +++ b/virttest/libvirt_xml/devices/watchdog.py @@ -4,9 +4,10 @@ http://libvirt.org/formatdomain.html#elementsWatchdog """ -import aexpect import logging +import aexpect + from virttest.libvirt_xml import accessors from virttest.libvirt_xml.devices import base diff --git a/virttest/libvirt_xml/domcapability_xml.py b/virttest/libvirt_xml/domcapability_xml.py index d41778535d..0b7a49d5ae 100644 --- a/virttest/libvirt_xml/domcapability_xml.py +++ b/virttest/libvirt_xml/domcapability_xml.py @@ -5,7 +5,7 @@ import logging from virttest import xml_utils -from virttest.libvirt_xml import base, accessors, xcepts +from virttest.libvirt_xml import accessors, base, xcepts LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/libvirt_xml/network_xml.py b/virttest/libvirt_xml/network_xml.py index 463b43ee5c..cc1cbdf818 100644 --- a/virttest/libvirt_xml/network_xml.py +++ b/virttest/libvirt_xml/network_xml.py @@ -6,7 +6,7 @@ import logging from virttest import xml_utils -from virttest.libvirt_xml import base, xcepts, accessors +from virttest.libvirt_xml import accessors, base, xcepts from virttest.libvirt_xml.devices import librarian LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/libvirt_xml/nodedev_xml.py b/virttest/libvirt_xml/nodedev_xml.py index 266e601b96..70918b07e0 100644 --- a/virttest/libvirt_xml/nodedev_xml.py +++ b/virttest/libvirt_xml/nodedev_xml.py @@ -5,7 +5,7 @@ import os -from virttest.libvirt_xml import base, xcepts, accessors +from virttest.libvirt_xml import accessors, base, xcepts class CAPXML(base.LibvirtXMLBase): diff --git a/virttest/libvirt_xml/nwfilter_binding.py b/virttest/libvirt_xml/nwfilter_binding.py index 1443a341da..f655f7e1d0 100644 --- a/virttest/libvirt_xml/nwfilter_binding.py +++ b/virttest/libvirt_xml/nwfilter_binding.py @@ -3,7 +3,7 @@ http://libvirt.org/formatnwfilter.html """ -from virttest.libvirt_xml import base, accessors +from virttest.libvirt_xml import accessors, base from virttest.libvirt_xml.devices.filterref import Filterref diff --git a/virttest/libvirt_xml/nwfilter_protocols/base.py b/virttest/libvirt_xml/nwfilter_protocols/base.py index 3da56f7deb..163f660c64 100644 --- a/virttest/libvirt_xml/nwfilter_protocols/base.py +++ b/virttest/libvirt_xml/nwfilter_protocols/base.py @@ -5,7 +5,7 @@ from six import StringIO from virttest import xml_utils -from virttest.libvirt_xml import base, xcepts, accessors +from virttest.libvirt_xml import accessors, base, xcepts class UntypedDeviceBase(base.LibvirtXMLBase): diff --git a/virttest/libvirt_xml/nwfilter_protocols/librarian.py b/virttest/libvirt_xml/nwfilter_protocols/librarian.py index 243c98933f..efaf0c61dc 100644 --- a/virttest/libvirt_xml/nwfilter_protocols/librarian.py +++ b/virttest/libvirt_xml/nwfilter_protocols/librarian.py @@ -6,7 +6,6 @@ from virttest.libvirt_xml import base - # Avoid accidental names like __init__, librarian, and/or other support modules FILTER_TYPES = [ "mac", diff --git a/virttest/libvirt_xml/nwfilter_xml.py b/virttest/libvirt_xml/nwfilter_xml.py index 2ed78784b0..1a469d62a3 100644 --- a/virttest/libvirt_xml/nwfilter_xml.py +++ b/virttest/libvirt_xml/nwfilter_xml.py @@ -3,7 +3,7 @@ http://libvirt.org/formatnwfilter.html """ -from virttest.libvirt_xml import base, xcepts, accessors +from virttest.libvirt_xml import accessors, base, xcepts from virttest.libvirt_xml.nwfilter_protocols import librarian diff --git a/virttest/libvirt_xml/pool_xml.py b/virttest/libvirt_xml/pool_xml.py index b1b66e8873..cd45538069 100644 --- a/virttest/libvirt_xml/pool_xml.py +++ b/virttest/libvirt_xml/pool_xml.py @@ -2,17 +2,15 @@ Module simplifying manipulation of XML described at http://libvirt.org/formatstorage.html#StoragePool """ -import os import logging +import os import tempfile - from xml.etree import ElementTree as ET from avocado.utils import process -from .. import data_dir -from .. import libvirt_storage -from ..libvirt_xml import base, xcepts, accessors +from .. import data_dir, libvirt_storage +from ..libvirt_xml import accessors, base, xcepts LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/libvirt_xml/secret_xml.py b/virttest/libvirt_xml/secret_xml.py index 436c1afe43..3abb7fb50b 100644 --- a/virttest/libvirt_xml/secret_xml.py +++ b/virttest/libvirt_xml/secret_xml.py @@ -3,8 +3,7 @@ http://libvirt.org/formatsecret.html """ -from virttest.libvirt_xml import base, accessors -from virttest.libvirt_xml import xcepts +from virttest.libvirt_xml import accessors, base, xcepts class SecretXMLBase(base.LibvirtXMLBase): diff --git a/virttest/libvirt_xml/snapshot_xml.py b/virttest/libvirt_xml/snapshot_xml.py index d57316b777..190dd55ea4 100644 --- a/virttest/libvirt_xml/snapshot_xml.py +++ b/virttest/libvirt_xml/snapshot_xml.py @@ -4,9 +4,8 @@ """ from virttest import xml_utils -from virttest.libvirt_xml import base, accessors +from virttest.libvirt_xml import accessors, base, xcepts from virttest.libvirt_xml.devices.disk import Disk -from virttest.libvirt_xml import xcepts class SnapshotXMLBase(base.LibvirtXMLBase): diff --git a/virttest/libvirt_xml/vm_xml.py b/virttest/libvirt_xml/vm_xml.py index 08a95766fd..dd977523e8 100755 --- a/virttest/libvirt_xml/vm_xml.py +++ b/virttest/libvirt_xml/vm_xml.py @@ -7,9 +7,8 @@ import platform import re -from .. import xml_utils -from .. import utils_misc -from ..libvirt_xml import base, accessors, xcepts +from .. import utils_misc, xml_utils +from ..libvirt_xml import accessors, base, xcepts from ..libvirt_xml.base import LibvirtXMLBase from ..libvirt_xml.devices import librarian diff --git a/virttest/libvirt_xml/vol_xml.py b/virttest/libvirt_xml/vol_xml.py index 8aae9dc1d4..d3794cb9de 100644 --- a/virttest/libvirt_xml/vol_xml.py +++ b/virttest/libvirt_xml/vol_xml.py @@ -3,7 +3,7 @@ http://libvirt.org/formatstorage.html#StorageVol """ -from virttest.libvirt_xml import base, accessors +from virttest.libvirt_xml import accessors, base from virttest.libvirt_xml.xcepts import LibvirtXMLNotFoundError diff --git a/virttest/libvirtd_decorator.py b/virttest/libvirtd_decorator.py index 2466788367..3146dd627b 100644 --- a/virttest/libvirtd_decorator.py +++ b/virttest/libvirtd_decorator.py @@ -6,12 +6,10 @@ import logging import os import re -from virttest import data_dir -from avocado.utils import process -from avocado.utils import path -from avocado.utils import astring +from avocado.utils import astring, path, process +from virttest import data_dir try: path.find_command("libvirtd") diff --git a/virttest/logging_manager.py b/virttest/logging_manager.py index 873b7a94a3..4337e7722e 100644 --- a/virttest/logging_manager.py +++ b/virttest/logging_manager.py @@ -1,6 +1,5 @@ import logging - # implementation follows logger = logging.getLogger("avocado.vt") diff --git a/virttest/lvm.py b/virttest/lvm.py index 1e9b758940..07f775af78 100644 --- a/virttest/lvm.py +++ b/virttest/lvm.py @@ -22,18 +22,17 @@ PhysicalVolume name eg, /dev/sdb or /dev/sdb1; """ from __future__ import division + +import logging +import math import os -import time import re -import math -import logging +import time from avocado.core import exceptions -from avocado.utils import path -from avocado.utils import process +from avocado.utils import path, process -from virttest import utils_misc -from virttest import data_dir +from virttest import data_dir, utils_misc LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/lvsb.py b/virttest/lvsb.py index 3670a0c9df..1dc3218c3a 100644 --- a/virttest/lvsb.py +++ b/virttest/lvsb.py @@ -5,12 +5,11 @@ """ import datetime -import time import logging +import time from virttest import lvsb_base - LOG = logging.getLogger("avocado." + __name__) # This utility function lets test-modules quickly create a list of all diff --git a/virttest/lvsb_base.py b/virttest/lvsb_base.py index 2a395a1c86..37dd4b8438 100644 --- a/virttest/lvsb_base.py +++ b/virttest/lvsb_base.py @@ -8,10 +8,8 @@ import signal import aexpect - from six.moves import xrange - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/lvsbs.py b/virttest/lvsbs.py index 44d75d9d36..22eb6c6663 100644 --- a/virttest/lvsbs.py +++ b/virttest/lvsbs.py @@ -2,11 +2,9 @@ Higher order classes for Libvirt Sandbox Service (lxc) service container testing """ -from avocado.utils import process -from avocado.utils import service +from avocado.utils import process, service -from . import lvsb_base -from . import virsh +from . import lvsb_base, virsh class SandboxService(object): diff --git a/virttest/migration.py b/virttest/migration.py index e73b15633c..f435ce67f8 100644 --- a/virttest/migration.py +++ b/virttest/migration.py @@ -1,28 +1,29 @@ -import time -import threading -import types import logging import re import signal +import threading +import time +import types -from avocado.utils import process -from avocado.utils import path as utils_path -from avocado.utils import distro from avocado.core import exceptions +from avocado.utils import distro +from avocado.utils import path as utils_path +from avocado.utils import process -from virttest import libvirt_version -from virttest import remote -from virttest import utils_disk -from virttest import utils_misc -from virttest import test_setup -from virttest import utils_net -from virttest import utils_iptables -from virttest import utils_test -from virttest.utils_test import libvirt - +from virttest import ( + libvirt_version, + remote, + test_setup, + utils_disk, + utils_iptables, + utils_misc, + utils_net, + utils_test, +) # lazy imports for dependencies that are not needed in all modes of use from virttest._wrappers import lazy_import +from virttest.utils_test import libvirt virsh = lazy_import("virttest.virsh") diff --git a/virttest/migration_template.py b/virttest/migration_template.py index 66bda9876e..c1bbff2b4c 100644 --- a/virttest/migration_template.py +++ b/virttest/migration_template.py @@ -1,30 +1,27 @@ -import logging import functools +import logging import os - from enum import Enum -from six import itervalues, iteritems, string_types - from avocado.utils import distro from avocado.utils import path as utils_path - -from virttest import virsh, migration, remote -from virttest import libvirt_version -from virttest import utils_iptables, utils_selinux, utils_misc - -from virttest.libvirt_xml import vm_xml - +from six import iteritems, itervalues, string_types + +from virttest import ( + libvirt_version, + migration, + remote, + utils_iptables, + utils_misc, + utils_selinux, + virsh, +) from virttest.libvirt_vm import get_uri_with_transport as get_uri - -from virttest.utils_conn import TLSConnection, TCPConnection, SSHConnection - -from virttest.utils_test import libvirt - +from virttest.libvirt_xml import vm_xml +from virttest.utils_conn import SSHConnection, TCPConnection, TLSConnection from virttest.utils_libvirt import libvirt_disk - from virttest.utils_libvirt.libvirt_config import remove_key_for_modular_daemon - +from virttest.utils_test import libvirt # Migration flags VIR_MIGRATE_LIVE = 1 << 0 diff --git a/virttest/nbd.py b/virttest/nbd.py index 4491ec5860..03a3177425 100644 --- a/virttest/nbd.py +++ b/virttest/nbd.py @@ -1,11 +1,10 @@ import os import string -from virttest import error_context -from virttest import utils_misc - from avocado.utils import process +from virttest import error_context, utils_misc + @error_context.context_aware def get_image_filename(params): diff --git a/virttest/nfs.py b/virttest/nfs.py index d8bf1e158c..ba1a903a6d 100644 --- a/virttest/nfs.py +++ b/virttest/nfs.py @@ -2,21 +2,18 @@ Basic nfs support for Linux host. It can support the remote nfs mount and the local nfs set up and mount. """ -import re -import aexpect import logging +import re -from avocado.utils import path -from avocado.utils import process -from avocado.utils import distro -from avocado.utils.astring import to_text +import aexpect from avocado.core import exceptions +from avocado.utils import distro, path, process +from avocado.utils.astring import to_text -from virttest import utils_misc -from virttest import test_setup -from virttest.utils_iptables import Iptables -from virttest.utils_conn import SSHConnection +from virttest import test_setup, utils_misc from virttest.staging import service +from virttest.utils_conn import SSHConnection +from virttest.utils_iptables import Iptables LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/openvswitch.py b/virttest/openvswitch.py index 69301336bf..1e2cd190e2 100644 --- a/virttest/openvswitch.py +++ b/virttest/openvswitch.py @@ -1,14 +1,12 @@ import logging -import re import os +import re import signal -from avocado.utils import path -from avocado.utils import process -from avocado.utils import linux_modules +from avocado.utils import linux_modules, path, process -from .versionable_class import VersionableClass, Manager, factory from . import utils_misc +from .versionable_class import Manager, VersionableClass, factory LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/ovirt.py b/virttest/ovirt.py index f4da2f1a85..187d9cb12a 100644 --- a/virttest/ovirt.py +++ b/virttest/ovirt.py @@ -5,8 +5,8 @@ """ -import time import logging +import time import ovirtsdk4 as sdk import ovirtsdk4.types as types @@ -14,7 +14,6 @@ from virttest import virt_vm from virttest.utils_net import ping - _api = None _connected = False diff --git a/virttest/ovs_utils.py b/virttest/ovs_utils.py index f7a0d74663..60e5a95723 100644 --- a/virttest/ovs_utils.py +++ b/virttest/ovs_utils.py @@ -8,7 +8,6 @@ from . import utils_net - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/postprocess_iozone.py b/virttest/postprocess_iozone.py index 25b1d210ef..ba9269447a 100755 --- a/virttest/postprocess_iozone.py +++ b/virttest/postprocess_iozone.py @@ -10,15 +10,15 @@ """ from __future__ import division -import os -import sys -import optparse + import logging import math +import optparse +import os +import sys import time -from avocado.utils import process -from avocado.utils import path +from avocado.utils import path, process from . import utils_misc diff --git a/virttest/ppm_utils.py b/virttest/ppm_utils.py index bd5824a06a..63c7567559 100644 --- a/virttest/ppm_utils.py +++ b/virttest/ppm_utils.py @@ -5,21 +5,17 @@ """ from __future__ import division + +import glob +import logging import os +import re import struct import time -import re -import glob -import logging - from functools import reduce - try: - from PIL import Image - from PIL import ImageOps - from PIL import ImageDraw - from PIL import ImageFont + from PIL import Image, ImageDraw, ImageFont, ImageOps except ImportError: Image = None logging.getLogger("avocado.app").warning( diff --git a/virttest/qemu_devices/qcontainer.py b/virttest/qemu_devices/qcontainer.py index f45b018904..4be4b0396b 100644 --- a/virttest/qemu_devices/qcontainer.py +++ b/virttest/qemu_devices/qcontainer.py @@ -9,21 +9,21 @@ # Python imports from __future__ import division + +import json import logging -import re import os +import re import shutil import stat -import json import uuid +import aexpect +import six + # Avocado imports from avocado.core import exceptions from avocado.utils import process - -import aexpect - -import six from six.moves import xrange try: @@ -32,14 +32,20 @@ from collections import Sequence # Internal imports -from virttest import vt_iothread -from virttest import utils_qemu -from virttest import utils_logfile -from virttest import utils_misc -from virttest import arch, storage, data_dir, virt_vm -from virttest import qemu_storage -from virttest.qemu_devices.qdevices import QThrottleGroup +from virttest import ( + arch, + data_dir, + qemu_storage, + storage, + utils_logfile, + utils_misc, + utils_qemu, + virt_vm, + vt_iothread, +) +from virttest.qemu_capabilities import Capabilities, Flags, MigrationParams from virttest.qemu_devices import qdevices +from virttest.qemu_devices.qdevices import QThrottleGroup from virttest.qemu_devices.utils import ( DeviceError, DeviceHotplugError, @@ -47,10 +53,9 @@ DeviceRemoveError, DeviceUnplugError, none_or_int, + set_cmdline_format_by_cfg, ) -from virttest.qemu_devices.utils import set_cmdline_format_by_cfg from virttest.utils_params import Params -from virttest.qemu_capabilities import Flags, Capabilities, MigrationParams from virttest.utils_version import VersionInterval LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/qemu_devices/qdevices.py b/virttest/qemu_devices/qdevices.py index 9c3bef92f4..5c697c522e 100644 --- a/virttest/qemu_devices/qdevices.py +++ b/virttest/qemu_devices/qdevices.py @@ -9,24 +9,20 @@ import json import logging import os -import time import re +import time import traceback from collections import OrderedDict from pathlib import Path import aexpect - -from virttest import qemu_monitor, utils_numeric -from virttest import utils_logfile -from virttest import utils_misc -from virttest.qemu_devices.utils import DeviceError -from virttest.qemu_devices.utils import none_or_int -from virttest.utils_version import VersionInterval - import six from six.moves import xrange +from virttest import qemu_monitor, utils_logfile, utils_misc, utils_numeric +from virttest.qemu_devices.utils import DeviceError, none_or_int +from virttest.utils_version import VersionInterval + LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/qemu_installer.py b/virttest/qemu_installer.py index 75e93aba57..0e78847874 100644 --- a/virttest/qemu_installer.py +++ b/virttest/qemu_installer.py @@ -4,8 +4,8 @@ See BaseInstaller class in base_installer.py for interface details. """ -import os import logging +import os from avocado.core import exceptions from avocado.utils import process diff --git a/virttest/qemu_io.py b/virttest/qemu_io.py index fb3477bc18..776e233a7c 100644 --- a/virttest/qemu_io.py +++ b/virttest/qemu_io.py @@ -3,9 +3,7 @@ import aexpect from avocado.utils import process -from virttest import utils_logfile -from virttest import utils_misc -from virttest import error_context +from virttest import error_context, utils_logfile, utils_misc class QemuIOParamError(Exception): diff --git a/virttest/qemu_migration.py b/virttest/qemu_migration.py index f5e7b540c3..8ef26ca2d0 100644 --- a/virttest/qemu_migration.py +++ b/virttest/qemu_migration.py @@ -2,9 +2,7 @@ Interface for QEMU migration. """ -from virttest.qemu_capabilities import MigrationParams -from virttest.qemu_capabilities import Flags - +from virttest.qemu_capabilities import Flags, MigrationParams from virttest.utils_numeric import normalize_data_size diff --git a/virttest/qemu_monitor.py b/virttest/qemu_monitor.py index 0ab97d661e..a3740daae9 100644 --- a/virttest/qemu_monitor.py +++ b/virttest/qemu_monitor.py @@ -18,13 +18,9 @@ import six -from . import utils_logfile -from . import utils_misc -from . import cartesian_config -from . import data_dir - from virttest.qemu_capabilities import Flags +from . import cartesian_config, data_dir, utils_logfile, utils_misc LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/qemu_qtree.py b/virttest/qemu_qtree.py index a0c91f24aa..1e4a7fd81b 100644 --- a/virttest/qemu_qtree.py +++ b/virttest/qemu_qtree.py @@ -9,14 +9,10 @@ import os import re +import six from six.moves import xrange -from . import storage -from . import data_dir -from . import utils_misc -from . import arch - -import six +from . import arch, data_dir, storage, utils_misc LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/qemu_storage.py b/virttest/qemu_storage.py index dc0fe1c031..95b0bbd3c9 100755 --- a/virttest/qemu_storage.py +++ b/virttest/qemu_storage.py @@ -10,18 +10,13 @@ import logging import os import re -import six import string +import six from avocado.core import exceptions from avocado.utils import process -from virttest import utils_misc -from virttest import virt_vm -from virttest import storage -from virttest import nvme -from virttest import data_dir -from virttest import error_context +from virttest import data_dir, error_context, nvme, storage, utils_misc, virt_vm LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/qemu_virtio_port.py b/virttest/qemu_virtio_port.py index a3ac26db17..6fc7519f11 100644 --- a/virttest/qemu_virtio_port.py +++ b/virttest/qemu_virtio_port.py @@ -4,21 +4,20 @@ :copyright: 2012 Red Hat Inc. """ from __future__ import division -from threading import Thread -from collections import deque + import logging import os import random import select import socket -import time import struct +import time +from collections import deque +from threading import Thread import aexpect - from avocado.core import exceptions from avocado.utils import process - from six.moves import xrange from virttest import data_dir diff --git a/virttest/qemu_vm.py b/virttest/qemu_vm.py index 83633d1636..8558b26b18 100644 --- a/virttest/qemu_vm.py +++ b/virttest/qemu_vm.py @@ -6,57 +6,53 @@ from __future__ import division -import shutil -import time -import os -import logging +import ast import fcntl -import re +import json +import logging +import math +import os import random +import re +import shutil import sys -import math -import json -import ast - +import time from functools import partial, reduce from operator import mul import aexpect +import six from aexpect import remote - from avocado.core import exceptions -from avocado.utils import process -from avocado.utils import crypto -from avocado.utils import linux_modules +from avocado.utils import crypto, linux_modules, process from avocado.utils.astring import to_text - -import six from six.moves import xrange -from virttest import utils_logfile -from virttest import utils_misc -from virttest import utils_qemu -from virttest import cpu -from virttest import virt_vm -from virttest import test_setup -from virttest import qemu_migration -from virttest import qemu_monitor -from virttest import qemu_virtio_port -from virttest import data_dir -from virttest import utils_net -from virttest import arch -from virttest import storage -from virttest import error_context -from virttest import utils_vsock -from virttest import utils_vdpa -from virttest import error_event -from virttest.qemu_devices import qdevices, qcontainer -from virttest.qemu_devices.utils import DeviceError, set_cmdline_format_by_cfg +from virttest import ( + arch, + cpu, + data_dir, + error_context, + error_event, + qemu_migration, + qemu_monitor, + qemu_virtio_port, + storage, + test_setup, + utils_logfile, + utils_misc, + utils_net, + utils_qemu, + utils_vdpa, + utils_vsock, + virt_vm, +) from virttest.qemu_capabilities import Flags +from virttest.qemu_devices import qcontainer, qdevices +from virttest.qemu_devices.utils import DeviceError, set_cmdline_format_by_cfg from virttest.utils_params import Params from virttest.utils_version import VersionInterval - # Using as lower capital is not the best way to do, but this is just a # workaround to avoid changing the entire file. LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/remote.py b/virttest/remote.py index e9109654e6..ce313c00e7 100644 --- a/virttest/remote.py +++ b/virttest/remote.py @@ -2,23 +2,21 @@ Functions and classes used for logging into guests and transferring files. """ from __future__ import division + import logging -import time -import re import os +import re import shutil import tempfile +import time import aexpect from aexpect.remote import * - from avocado.core import exceptions from avocado.utils import process -from virttest import data_dir -from virttest import utils_logfile -from virttest.remote_commander import remote_master -from virttest.remote_commander import messenger +from virttest import data_dir, utils_logfile +from virttest.remote_commander import messenger, remote_master LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/remote_build.py b/virttest/remote_build.py index 2290664335..57e584d728 100644 --- a/virttest/remote_build.py +++ b/virttest/remote_build.py @@ -1,13 +1,12 @@ -import os -import re import hashlib import logging +import os +import re from aexpect import remote from virttest import data_dir - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/remote_commander/messenger.py b/virttest/remote_commander/messenger.py index 639780ca5e..562b807871 100755 --- a/virttest/remote_commander/messenger.py +++ b/virttest/remote_commander/messenger.py @@ -7,12 +7,12 @@ :contact: Andrei Stepanov """ -import os +import base64 +import importlib import logging +import os import select import time -import base64 -import importlib try: from cStringIO import StringIO diff --git a/virttest/remote_commander/remote_master.py b/virttest/remote_commander/remote_master.py index a9f3c4df33..f42d636849 100644 --- a/virttest/remote_commander/remote_master.py +++ b/virttest/remote_commander/remote_master.py @@ -8,12 +8,12 @@ """ from __future__ import division + +import inspect import sys import time -import inspect -from virttest.remote_commander import remote_interface -from virttest.remote_commander import messenger +from virttest.remote_commander import messenger, remote_interface def getsource(obj): diff --git a/virttest/remote_commander/remote_runner.py b/virttest/remote_commander/remote_runner.py index e1861cbbad..378d149b5e 100755 --- a/virttest/remote_commander/remote_runner.py +++ b/virttest/remote_commander/remote_runner.py @@ -7,21 +7,21 @@ :contact: Andrei Stepanov """ -import os -import sys -import importlib -import select -import time -import stat import gc +import importlib import logging -import traceback -import subprocess -import string +import os import random +import select import shutil import signal +import stat +import string +import subprocess +import sys import tempfile +import time +import traceback if __name__ == "__main__": remote_interface = importlib.import_module("remote_interface") @@ -30,10 +30,8 @@ from virttest.remote_commander import remote_interface from virttest.remote_commander import messenger as ms - from six.moves import input - logging.basicConfig(level=logging.DEBUG) logger = logging.getLogger(__name__) logfile = tempfile.mktemp(suffix=".log", prefix="remote_runner", dir="/tmp") diff --git a/virttest/scan_autotest_results.py b/virttest/scan_autotest_results.py index c63320f287..e5f5e80d6f 100644 --- a/virttest/scan_autotest_results.py +++ b/virttest/scan_autotest_results.py @@ -100,9 +100,9 @@ def main(resfiles): if __name__ == "__main__": - import sys import glob import os + import sys dirname = os.path.dirname(sys.modules[__name__].__file__) CLIENT_DIR = os.path.abspath(os.path.join(dirname, "..")) diff --git a/virttest/scheduler.py b/virttest/scheduler.py index 5eb452e802..5ec1c4e8ae 100644 --- a/virttest/scheduler.py +++ b/virttest/scheduler.py @@ -3,8 +3,7 @@ import aexpect -from virttest import utils_env -from virttest import virt_vm +from virttest import utils_env, virt_vm class scheduler: diff --git a/virttest/shared/deps/run_autotest/boottool.py b/virttest/shared/deps/run_autotest/boottool.py index 1b2d8c22fe..603fbca791 100755 --- a/virttest/shared/deps/run_autotest/boottool.py +++ b/virttest/shared/deps/run_autotest/boottool.py @@ -6,21 +6,20 @@ [1] - http://git.fedorahosted.org/git/?p=grubby.git """ +import logging +import optparse import os import re -import sys -import optparse -import logging +import shutil +import struct import subprocess +import sys import tarfile import tempfile -import shutil -import struct import six from six.moves import urllib - # # Get rid of DeprecationWarning messages on newer Python version while still # making it run on properly on Python 2.4 diff --git a/virttest/shared/deps/run_autotest/kernel_install/kernelinstall.py b/virttest/shared/deps/run_autotest/kernel_install/kernelinstall.py index 131a714318..b6dfb07ffe 100644 --- a/virttest/shared/deps/run_autotest/kernel_install/kernelinstall.py +++ b/virttest/shared/deps/run_autotest/kernel_install/kernelinstall.py @@ -1,10 +1,9 @@ -import os import logging +import os import sys -from autotest.client import test -from autotest.client import utils -from autotest.client.shared import git, error, software_manager +from autotest.client import test, utils +from autotest.client.shared import error, git, software_manager LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/shared/deps/serial/VirtIoChannel_guest_send_receive.py b/virttest/shared/deps/serial/VirtIoChannel_guest_send_receive.py index fef28eeb75..d7bc6350c2 100755 --- a/virttest/shared/deps/serial/VirtIoChannel_guest_send_receive.py +++ b/virttest/shared/deps/serial/VirtIoChannel_guest_send_receive.py @@ -8,10 +8,10 @@ # LICENSE_GPL_v2 which accompany this distribution. # +import optparse import os -import struct import platform -import optparse +import struct try: import hashlib diff --git a/virttest/shared/deps/serial/serial_host_send_receive.py b/virttest/shared/deps/serial/serial_host_send_receive.py index 28a70b25b3..e60dc0417f 100755 --- a/virttest/shared/deps/serial/serial_host_send_receive.py +++ b/virttest/shared/deps/serial/serial_host_send_receive.py @@ -1,9 +1,9 @@ #!/usr/bin/python +import optparse import os import socket import struct -import optparse try: import hashlib diff --git a/virttest/shared/deps/serial/windows_support.py b/virttest/shared/deps/serial/windows_support.py index fbc0ee3876..9525cd64c4 100755 --- a/virttest/shared/deps/serial/windows_support.py +++ b/virttest/shared/deps/serial/windows_support.py @@ -1,9 +1,9 @@ -import win32security -import win32file -import win32event -import win32con -import win32api import pywintypes +import win32api +import win32con +import win32event +import win32file +import win32security class WinBufferedReadFile(object): diff --git a/virttest/shared/scripts/cb.py b/virttest/shared/scripts/cb.py index d51023941a..d06f266b2e 100644 --- a/virttest/shared/scripts/cb.py +++ b/virttest/shared/scripts/cb.py @@ -1,11 +1,11 @@ import pygtk pygtk.require("2.0") -import gtk -import sys import os +import sys from optparse import OptionParser +import gtk from six.moves import xrange diff --git a/virttest/shared/scripts/cmd_runner.py b/virttest/shared/scripts/cmd_runner.py index ba19d39699..9f793e0aed 100644 --- a/virttest/shared/scripts/cmd_runner.py +++ b/virttest/shared/scripts/cmd_runner.py @@ -3,13 +3,13 @@ information in background, redirect the outputs to log files. """ -import threading -import shelve -import re import os -import sys import random +import re +import shelve import string +import sys +import threading def getstatusoutput(cmd): diff --git a/virttest/shared/scripts/dd.py b/virttest/shared/scripts/dd.py index 529a2748c2..028bb3de24 100644 --- a/virttest/shared/scripts/dd.py +++ b/virttest/shared/scripts/dd.py @@ -1,6 +1,5 @@ -import sys import os - +import sys if len(sys.argv) != 3: print("Useage: %s path size") diff --git a/virttest/shared/scripts/duplicate_pages.py b/virttest/shared/scripts/duplicate_pages.py index 692f07c1d4..52bf9d8bc6 100644 --- a/virttest/shared/scripts/duplicate_pages.py +++ b/virttest/shared/scripts/duplicate_pages.py @@ -2,7 +2,6 @@ import os - mem_fd = open("/proc/meminfo", "r") contents = mem_fd.readlines() mem_fd.close() diff --git a/virttest/shared/scripts/ksm_overcommit_guest.py b/virttest/shared/scripts/ksm_overcommit_guest.py index cc15f54e1d..61249ffc37 100755 --- a/virttest/shared/scripts/ksm_overcommit_guest.py +++ b/virttest/shared/scripts/ksm_overcommit_guest.py @@ -8,18 +8,18 @@ """ from __future__ import division -import os + import array -import sys -import random import copy -import tempfile import datetime import math +import os +import random +import sys +import tempfile from six.moves import input - PAGE_SIZE = 4096 # machine page size TMPFS_OVERHEAD = 0.0022 # overhead on 1MB of write data diff --git a/virttest/shared/scripts/multicast_guest.py b/virttest/shared/scripts/multicast_guest.py index 756add8dca..1eb22156a1 100755 --- a/virttest/shared/scripts/multicast_guest.py +++ b/virttest/shared/scripts/multicast_guest.py @@ -1,8 +1,8 @@ #!/usr/bin/python -import socket -import struct import os import signal +import socket +import struct import sys # -*- coding: utf-8 -*- diff --git a/virttest/shared/scripts/telnet.py b/virttest/shared/scripts/telnet.py index 5bdff3b3e7..6f93c417f0 100644 --- a/virttest/shared/scripts/telnet.py +++ b/virttest/shared/scripts/telnet.py @@ -1,6 +1,6 @@ -import telnetlib -import sys import os +import sys +import telnetlib if len(sys.argv) != 5: print("Usage: %s host_ip user password prompt" % sys.argv[0]) diff --git a/virttest/shared/scripts/virtio_console_guest.py b/virttest/shared/scripts/virtio_console_guest.py index 45d5957f29..da1bb5052b 100755 --- a/virttest/shared/scripts/virtio_console_guest.py +++ b/virttest/shared/scripts/virtio_console_guest.py @@ -8,20 +8,21 @@ :author: Lukas Doktor (ldoktor@redhat.com) """ from __future__ import division -import threading -from threading import Thread + +import array import os -import select -import re +import platform import random -import sys -import array -import stat -import traceback +import re +import select import signal +import stat +import sys +import threading import time -import platform +import traceback from distutils.version import LooseVersion # pylint: disable=W0611,E0611 +from threading import Thread # For Python 2 and 3 compatibility # xrange diff --git a/virttest/ssh_key.py b/virttest/ssh_key.py index 7d319dd25b..e942760a11 100644 --- a/virttest/ssh_key.py +++ b/virttest/ssh_key.py @@ -1,11 +1,9 @@ -import os import logging +import os import aexpect from aexpect import remote - -from avocado.utils import process -from avocado.utils import path +from avocado.utils import path, process from virttest import remote as remote_old diff --git a/virttest/staging/__init__.py b/virttest/staging/__init__.py index ab0b518706..56ce69dd92 100644 --- a/virttest/staging/__init__.py +++ b/virttest/staging/__init__.py @@ -1,5 +1,2 @@ __all__ = ["service", "utils_cgroup", "utils_koji", "utils_memory"] -from virttest.staging import service -from virttest.staging import utils_cgroup -from virttest.staging import utils_koji -from virttest.staging import utils_memory +from virttest.staging import service, utils_cgroup, utils_koji, utils_memory diff --git a/virttest/staging/lv_utils.py b/virttest/staging/lv_utils.py index d3041b62fc..af844281e6 100644 --- a/virttest/staging/lv_utils.py +++ b/virttest/staging/lv_utils.py @@ -39,8 +39,8 @@ """ import logging -import re import os +import re import shutil import time diff --git a/virttest/staging/service.py b/virttest/staging/service.py index 3d52726501..da95ed5ac2 100644 --- a/virttest/staging/service.py +++ b/virttest/staging/service.py @@ -16,14 +16,13 @@ # The full GNU General Public License is included in this distribution in # the file called "COPYING". +import logging import os import re -import logging from tempfile import mktemp from avocado.utils import process - _COMMAND_TABLE_DOC = """ Taken from http://fedoraproject.org/wiki/SysVinit_to_Systemd_Cheatsheet diff --git a/virttest/staging/utils_cgroup.py b/virttest/staging/utils_cgroup.py index 02fcc2bfdf..0e6035b862 100755 --- a/virttest/staging/utils_cgroup.py +++ b/virttest/staging/utils_cgroup.py @@ -8,17 +8,17 @@ """ import logging import os +import random +import re import shutil import subprocess import time -import re -import random -import six from tempfile import mkdtemp +import six from avocado.core import exceptions -from avocado.utils.software_manager import manager from avocado.utils import process +from avocado.utils.software_manager import manager from . import service diff --git a/virttest/staging/utils_koji.py b/virttest/staging/utils_koji.py index dedf3b5b19..39282b684f 100644 --- a/virttest/staging/utils_koji.py +++ b/virttest/staging/utils_koji.py @@ -1,6 +1,6 @@ +import logging import os import time -import logging try: from html.parser import HTMLParser @@ -11,13 +11,9 @@ except ImportError: import ConfigParser -from avocado.utils import astring -from avocado.utils import path -from avocado.utils import download - +from avocado.utils import astring, download, path from six.moves import urllib - try: import koji diff --git a/virttest/staging/utils_memory.py b/virttest/staging/utils_memory.py index 3e4badf282..ee7401ed46 100644 --- a/virttest/staging/utils_memory.py +++ b/virttest/staging/utils_memory.py @@ -1,8 +1,9 @@ from __future__ import division -import re -import math + import logging +import math import os +import re from avocado.core import exceptions from avocado.utils import process diff --git a/virttest/standalone_test.py b/virttest/standalone_test.py index f6ddaef30b..cfb4212497 100644 --- a/virttest/standalone_test.py +++ b/virttest/standalone_test.py @@ -2,8 +2,7 @@ from avocado.utils import path as utils_path -from . import data_dir -from . import cartesian_config +from . import cartesian_config, data_dir from .compat import get_opt GUEST_NAME_LIST = None diff --git a/virttest/step_editor.py b/virttest/step_editor.py index 6a5c49ba74..9c4e3b8867 100755 --- a/virttest/step_editor.py +++ b/virttest/step_editor.py @@ -6,11 +6,11 @@ :author: mgoldish@redhat.com (Michael Goldish) """ -import os import glob +import logging +import os import shutil import sys -import logging try: from gi import pygtkcompat as pygtk @@ -23,7 +23,6 @@ from virttest import ppm_utils - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/storage.py b/virttest/storage.py index d1427bd22b..555226cf3e 100644 --- a/virttest/storage.py +++ b/virttest/storage.py @@ -6,32 +6,35 @@ - class for image operates and basic parameters """ from __future__ import division + +import collections import errno +import functools +import json import logging import os -import shutil import re -import functools -import collections -import json +import shutil from avocado.core import exceptions from avocado.utils import process -from virttest import storage_ssh -from virttest import nbd -from virttest import curl -from virttest import iscsi -from virttest import utils_misc -from virttest import utils_numeric -from virttest import utils_params -from virttest import virt_vm -from virttest import gluster -from virttest import lvm -from virttest import ceph -from virttest import nvme -from virttest import data_dir -from virttest import vdpa_blk +from virttest import ( + ceph, + curl, + data_dir, + gluster, + iscsi, + lvm, + nbd, + nvme, + storage_ssh, + utils_misc, + utils_numeric, + utils_params, + vdpa_blk, + virt_vm, +) LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/storage_ssh.py b/virttest/storage_ssh.py index 434a85a9ac..41737012a1 100644 --- a/virttest/storage_ssh.py +++ b/virttest/storage_ssh.py @@ -1,7 +1,7 @@ -from virttest import error_context - from avocado.utils import process +from virttest import error_context + @error_context.context_aware def get_image_filename(server, image_path, user=None, port=None, host_key_check=None): diff --git a/virttest/syslog_server.py b/virttest/syslog_server.py index e40bb694e3..b5b2a15e0a 100644 --- a/virttest/syslog_server.py +++ b/virttest/syslog_server.py @@ -1,5 +1,5 @@ -import re import logging +import re try: import SocketServer as socketserver diff --git a/virttest/test_setup/__init__.py b/virttest/test_setup/__init__.py index 2cb0cd1c9c..38f37dc2f2 100644 --- a/virttest/test_setup/__init__.py +++ b/virttest/test_setup/__init__.py @@ -1,46 +1,39 @@ """Library to perform pre/post test setup for virt test.""" from __future__ import division -import os + +import ipaddress import logging -import time -import re -import random import math -import shutil +import os import platform -import ipaddress -import six - +import random +import re +import shutil +import time from pathlib import Path +import six from aexpect import remote - -from avocado.utils import process -from avocado.utils import archive -from avocado.utils import wait -from avocado.utils import genio -from avocado.utils import path -from avocado.utils import distro -from avocado.utils import linux_modules from avocado.core import exceptions - -from virttest import data_dir -from virttest import error_context -from virttest import cpu -from virttest import utils_logfile -from virttest import utils_misc -from virttest import versionable_class -from virttest import openvswitch -from virttest import utils_libvirtd -from virttest import utils_net -from virttest import utils_config -from virttest import utils_package -from virttest import kernel_interface -from virttest import libvirt_version -from virttest import utils_split_daemons -from virttest.staging import service -from virttest.staging import utils_memory - +from avocado.utils import archive, distro, genio, linux_modules, path, process, wait + +from virttest import ( + cpu, + data_dir, + error_context, + kernel_interface, + libvirt_version, + openvswitch, + utils_config, + utils_libvirtd, + utils_logfile, + utils_misc, + utils_net, + utils_package, + utils_split_daemons, + versionable_class, +) +from virttest.staging import service, utils_memory ARCH = platform.machine() diff --git a/virttest/test_setup/core.py b/virttest/test_setup/core.py index c23929d974..ad73f90c29 100644 --- a/virttest/test_setup/core.py +++ b/virttest/test_setup/core.py @@ -1,8 +1,7 @@ import logging -import six +from abc import ABCMeta, abstractmethod -from abc import ABCMeta -from abc import abstractmethod +import six LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/test_setup/libvirt_setup.py b/virttest/test_setup/libvirt_setup.py index 882ab8de29..68eedcb040 100644 --- a/virttest/test_setup/libvirt_setup.py +++ b/virttest/test_setup/libvirt_setup.py @@ -1,5 +1,5 @@ -from virttest.test_setup.core import Setuper from virttest import test_setup +from virttest.test_setup.core import Setuper class LibvirtdDebugLogConfig(Setuper): diff --git a/virttest/test_setup/networking.py b/virttest/test_setup/networking.py index fb1ec072e5..70fb878567 100644 --- a/virttest/test_setup/networking.py +++ b/virttest/test_setup/networking.py @@ -3,8 +3,8 @@ import re import urllib.request -from virttest.test_setup.core import Setuper from virttest.test_setup import PrivateBridgeConfig, PrivateOvsBridgeConfig +from virttest.test_setup.core import Setuper class NetworkProxies(Setuper): diff --git a/virttest/tests/unattended_install.py b/virttest/tests/unattended_install.py index 216426c3ea..32c66cb5a3 100644 --- a/virttest/tests/unattended_install.py +++ b/virttest/tests/unattended_install.py @@ -1,12 +1,13 @@ from __future__ import division + import logging -import time -import re import os -import tempfile -import threading +import re import shutil import stat +import tempfile +import threading +import time import xml.dom.minidom try: @@ -15,29 +16,25 @@ import ConfigParser from aexpect import remote - from avocado.core import exceptions -from avocado.utils import astring -from avocado.utils import iso9660 -from avocado.utils import process -from avocado.utils import crypto -from avocado.utils import download - -from virttest import virt_vm -from virttest import asset -from virttest import utils_disk -from virttest import qemu_monitor -from virttest import syslog_server -from virttest import http_server -from virttest import data_dir -from virttest import utils_net -from virttest import utils_test -from virttest import utils_misc -from virttest import funcatexit -from virttest import storage -from virttest import error_context -from virttest import qemu_storage - +from avocado.utils import astring, crypto, download, iso9660, process + +from virttest import ( + asset, + data_dir, + error_context, + funcatexit, + http_server, + qemu_monitor, + qemu_storage, + storage, + syslog_server, + utils_disk, + utils_misc, + utils_net, + utils_test, + virt_vm, +) # Whether to print all shell commands called DEBUG = False diff --git a/virttest/unittest_utils/mock.py b/virttest/unittest_utils/mock.py index 1e063c8e90..149672eade 100644 --- a/virttest/unittest_utils/mock.py +++ b/virttest/unittest_utils/mock.py @@ -1,4 +1,5 @@ from __future__ import print_function + import collections import re import sys @@ -7,7 +8,6 @@ from six import StringIO from six import string_types as basestring - __author__ = "raphtee@google.com (Travis Miller)" diff --git a/virttest/unittests/libvirt_xml/device_xml/test_controller_xml.py b/virttest/unittests/libvirt_xml/device_xml/test_controller_xml.py index db1479e0da..6fb1ba5535 100644 --- a/virttest/unittests/libvirt_xml/device_xml/test_controller_xml.py +++ b/virttest/unittests/libvirt_xml/device_xml/test_controller_xml.py @@ -2,7 +2,6 @@ from virttest.libvirt_xml.devices import controller - XM_PCI = """ diff --git a/virttest/unittests/libvirt_xml/device_xml/test_interface_xml.py b/virttest/unittests/libvirt_xml/device_xml/test_interface_xml.py index ee74655632..35d9ed98fd 100644 --- a/virttest/unittests/libvirt_xml/device_xml/test_interface_xml.py +++ b/virttest/unittests/libvirt_xml/device_xml/test_interface_xml.py @@ -2,7 +2,6 @@ from virttest.libvirt_xml.devices import interface - XML = """ diff --git a/virttest/unittests/test_utils_misc.py b/virttest/unittests/test_utils_misc.py index 5e1fa4fb14..2fa46cf9fc 100644 --- a/virttest/unittests/test_utils_misc.py +++ b/virttest/unittests/test_utils_misc.py @@ -1,9 +1,8 @@ -import unittest import logging +import unittest from virttest import utils_misc - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/unittests/test_utils_test__init__.py b/virttest/unittests/test_utils_test__init__.py index 56b2f4da9e..a42b65073d 100644 --- a/virttest/unittests/test_utils_test__init__.py +++ b/virttest/unittests/test_utils_test__init__.py @@ -1,15 +1,16 @@ -import unittest import logging +import unittest try: from unittest import mock except ImportError: import mock -from virttest.utils_test import update_boot_option -from virttest import utils_test from avocado.core import exceptions +from virttest import utils_test +from virttest.utils_test import update_boot_option + check_kernel_cmdline_mock = mock.MagicMock(return_value=["3", None]) LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_backup.py b/virttest/utils_backup.py index 62f2815750..734579158c 100644 --- a/virttest/utils_backup.py +++ b/virttest/utils_backup.py @@ -1,22 +1,17 @@ +import filecmp +import json import logging import os -import json -import filecmp - import xml.etree.ElementTree as ET -from avocado.utils import process from avocado.core import exceptions +from avocado.utils import process -from virttest import utils_misc -from virttest import virsh -from virttest import libvirt_version -from virttest import data_dir +from virttest import data_dir, libvirt_version, utils_misc, virsh from virttest.libvirt_xml import vm_xml from virttest.libvirt_xml.backup_xml import BackupXML from virttest.libvirt_xml.checkpoint_xml import CheckpointXML - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_config.py b/virttest/utils_config.py index fd69c6859f..d15ce77b61 100644 --- a/virttest/utils_config.py +++ b/virttest/utils_config.py @@ -1,6 +1,7 @@ import ast import logging import os.path + from six import StringIO try: diff --git a/virttest/utils_conn.py b/virttest/utils_conn.py index 17246744ee..5ed51d1e39 100644 --- a/virttest/utils_conn.py +++ b/virttest/utils_conn.py @@ -9,19 +9,18 @@ import aexpect from aexpect import remote - from avocado.core import exceptions -from avocado.utils import path -from avocado.utils import process +from avocado.utils import path, process -from virttest import propcan, utils_libvirtd +from virttest import data_dir, libvirt_version, propcan from virttest import remote as remote_old -from virttest import data_dir -from virttest import utils_misc -from virttest import utils_package -from virttest import libvirt_version -from virttest import utils_split_daemons -from virttest import utils_iptables +from virttest import ( + utils_iptables, + utils_libvirtd, + utils_misc, + utils_package, + utils_split_daemons, +) LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_disk.py b/virttest/utils_disk.py index e8ac93384f..0981b1ea6f 100644 --- a/virttest/utils_disk.py +++ b/virttest/utils_disk.py @@ -3,32 +3,29 @@ :copyright: Red Hat Inc. """ -import os import glob -import shutil -import stat +import logging +import os import platform import random +import re +import shutil +import stat import string import tempfile -import logging -import re try: import configparser as ConfigParser except ImportError: import ConfigParser + from functools import cmp_to_key from avocado.core import exceptions -from avocado.utils import process -from avocado.utils import wait +from avocado.utils import process, wait from avocado.utils.service import SpecificServiceManager -from virttest import error_context -from virttest import utils_numeric -from virttest import utils_misc -from virttest import remote +from virttest import error_context, remote, utils_misc, utils_numeric PARTITION_TABLE_TYPE_MBR = "msdos" PARTITION_TABLE_TYPE_GPT = "gpt" diff --git a/virttest/utils_env.py b/virttest/utils_env.py index 4a1ba5405c..ea80f07f9e 100644 --- a/virttest/utils_env.py +++ b/virttest/utils_env.py @@ -1,7 +1,7 @@ -import os +import functools import logging +import os import threading -import functools try: from collections import UserDict as IterableUserDict @@ -13,11 +13,9 @@ import cPickle from aexpect import remote - from avocado.core import exceptions -from virttest import virt_vm -from virttest import ip_sniffing +from virttest import ip_sniffing, virt_vm ENV_VERSION = 1 diff --git a/virttest/utils_gdb.py b/virttest/utils_gdb.py index e76f720213..1424f75000 100644 --- a/virttest/utils_gdb.py +++ b/virttest/utils_gdb.py @@ -1,5 +1,5 @@ -import os import logging +import os import signal import threading @@ -8,9 +8,10 @@ except ImportError: import Queue +from enum import Enum + import aexpect -from enum import Enum from virttest import utils_misc LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_hotplug.py b/virttest/utils_hotplug.py index e85055ba43..b488af9ca5 100644 --- a/virttest/utils_hotplug.py +++ b/virttest/utils_hotplug.py @@ -18,8 +18,8 @@ import logging -from virttest.libvirt_xml.devices import memory +from virttest.libvirt_xml.devices import memory LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_iptables.py b/virttest/utils_iptables.py index 18fa8d9759..63885a9e5d 100644 --- a/virttest/utils_iptables.py +++ b/virttest/utils_iptables.py @@ -4,9 +4,8 @@ import logging from aexpect import remote - -from avocado.utils import process from avocado.core import exceptions +from avocado.utils import process LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_kernel_module.py b/virttest/utils_kernel_module.py index bd89693a28..608ba385ea 100644 --- a/virttest/utils_kernel_module.py +++ b/virttest/utils_kernel_module.py @@ -16,8 +16,8 @@ Handle Linux kernel modules """ -import os import logging +import os from avocado.utils import process diff --git a/virttest/utils_libguestfs.py b/virttest/utils_libguestfs.py index cc6dcc85c7..2e2af74e4a 100644 --- a/virttest/utils_libguestfs.py +++ b/virttest/utils_libguestfs.py @@ -3,13 +3,12 @@ """ import logging -import signal import os import re +import signal import aexpect -from avocado.utils import path -from avocado.utils import process +from avocado.utils import path, process from . import propcan diff --git a/virttest/utils_libvirt/libvirt_bios.py b/virttest/utils_libvirt/libvirt_bios.py index 94178b9d8b..b2c5ee1a9a 100644 --- a/virttest/utils_libvirt/libvirt_bios.py +++ b/virttest/utils_libvirt/libvirt_bios.py @@ -6,7 +6,6 @@ import logging - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_ceph_utils.py b/virttest/utils_libvirt/libvirt_ceph_utils.py index 139252c3ed..eb2a28a7ee 100644 --- a/virttest/utils_libvirt/libvirt_ceph_utils.py +++ b/virttest/utils_libvirt/libvirt_ceph_utils.py @@ -12,15 +12,10 @@ from avocado.core import exceptions from avocado.utils import process -from virttest import ceph -from virttest import data_dir -from virttest import utils_package -from virttest import virsh - -from virttest.utils_test import libvirt -from virttest.utils_libvirt import libvirt_disk - +from virttest import ceph, data_dir, utils_package, virsh from virttest.libvirt_xml import vm_xml +from virttest.utils_libvirt import libvirt_disk +from virttest.utils_test import libvirt LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_config.py b/virttest/utils_libvirt/libvirt_config.py index 85b5651aea..cb2280b185 100644 --- a/virttest/utils_libvirt/libvirt_config.py +++ b/virttest/utils_libvirt/libvirt_config.py @@ -7,10 +7,7 @@ from avocado.core import exceptions -from virttest import utils_config -from virttest import utils_libvirtd -from virttest import utils_split_daemons -from virttest import remote +from virttest import remote, utils_config, utils_libvirtd, utils_split_daemons from virttest.utils_test import libvirt LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_disk.py b/virttest/utils_libvirt/libvirt_disk.py index 30d703613b..d4a14ed683 100644 --- a/virttest/utils_libvirt/libvirt_disk.py +++ b/virttest/utils_libvirt/libvirt_disk.py @@ -11,15 +11,10 @@ from virttest import libvirt_storage from virttest import remote as remote_old -from virttest import utils_misc -from virttest import utils_disk -from virttest import virsh -from virttest import utils_package - +from virttest import utils_disk, utils_misc, utils_package, virsh from virttest.libvirt_xml import vm_xml -from virttest.utils_test import libvirt - from virttest.libvirt_xml.devices.disk import Disk +from virttest.utils_test import libvirt LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_embedded_qemu.py b/virttest/utils_libvirt/libvirt_embedded_qemu.py index c5219cbfe5..63688792e4 100644 --- a/virttest/utils_libvirt/libvirt_embedded_qemu.py +++ b/virttest/utils_libvirt/libvirt_embedded_qemu.py @@ -1,16 +1,14 @@ """ Classes and functions for embedded qemu driver. """ -import re import logging +import re import aexpect from avocado.core import exceptions -from avocado.utils import path -from avocado.utils import process +from avocado.utils import path, process -from virttest import utils_split_daemons -from virttest import utils_misc +from virttest import utils_misc, utils_split_daemons try: path.find_command("virt-qemu-run") diff --git a/virttest/utils_libvirt/libvirt_misc.py b/virttest/utils_libvirt/libvirt_misc.py index 6f8974cd00..a4e38f7ea1 100644 --- a/virttest/utils_libvirt/libvirt_misc.py +++ b/virttest/utils_libvirt/libvirt_misc.py @@ -4,8 +4,8 @@ :copyright: 2021 Red Hat Inc. """ -import re import logging +import re LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_monitor.py b/virttest/utils_libvirt/libvirt_monitor.py index 669a1c5b14..67c4522f61 100644 --- a/virttest/utils_libvirt/libvirt_monitor.py +++ b/virttest/utils_libvirt/libvirt_monitor.py @@ -4,8 +4,7 @@ from avocado.core import exceptions -from virttest import libvirt_version -from virttest import virsh +from virttest import libvirt_version, virsh LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_nested.py b/virttest/utils_libvirt/libvirt_nested.py index c9936ba141..0fe038f15b 100644 --- a/virttest/utils_libvirt/libvirt_nested.py +++ b/virttest/utils_libvirt/libvirt_nested.py @@ -3,9 +3,7 @@ from avocado.core import exceptions from avocado.utils import process -from virttest import cpu -from virttest import utils_package - +from virttest import cpu, utils_package LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_network.py b/virttest/utils_libvirt/libvirt_network.py index 3b1ee804b4..c98c24fcb2 100644 --- a/virttest/utils_libvirt/libvirt_network.py +++ b/virttest/utils_libvirt/libvirt_network.py @@ -1,18 +1,14 @@ """ Virsh net* command related utility functions """ -import re -import logging import ast +import logging +import re from avocado.core import exceptions from avocado.utils import process -from virttest import virsh -from virttest import remote -from virttest import utils_misc -from virttest import utils_iptables - +from virttest import remote, utils_iptables, utils_misc, virsh from virttest.libvirt_xml import NetworkXML from virttest.utils_test import libvirt diff --git a/virttest/utils_libvirt/libvirt_numa.py b/virttest/utils_libvirt/libvirt_numa.py index 89b3940e67..bea473c987 100644 --- a/virttest/utils_libvirt/libvirt_numa.py +++ b/virttest/utils_libvirt/libvirt_numa.py @@ -4,8 +4,8 @@ """ -import logging import ast +import logging from avocado.core import exceptions diff --git a/virttest/utils_libvirt/libvirt_pcicontr.py b/virttest/utils_libvirt/libvirt_pcicontr.py index 7e1000382c..db55e35813 100644 --- a/virttest/utils_libvirt/libvirt_pcicontr.py +++ b/virttest/utils_libvirt/libvirt_pcicontr.py @@ -6,8 +6,8 @@ import logging -from virttest.utils_test import libvirt from virttest.libvirt_xml import vm_xml +from virttest.utils_test import libvirt LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_secret.py b/virttest/utils_libvirt/libvirt_secret.py index f8d09d34fa..bb4e44e79f 100644 --- a/virttest/utils_libvirt/libvirt_secret.py +++ b/virttest/utils_libvirt/libvirt_secret.py @@ -6,12 +6,11 @@ import re from aexpect import remote - from avocado.core import exceptions from virttest import virsh -from virttest.utils_test import libvirt from virttest.libvirt_xml import secret_xml +from virttest.utils_test import libvirt LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_service.py b/virttest/utils_libvirt/libvirt_service.py index c71ea9532b..3bd4156127 100644 --- a/virttest/utils_libvirt/libvirt_service.py +++ b/virttest/utils_libvirt/libvirt_service.py @@ -2,9 +2,7 @@ from avocado.utils import process -from virttest import utils_libvirtd -from virttest import remote - +from virttest import remote, utils_libvirtd from virttest.staging import service LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_unprivileged.py b/virttest/utils_libvirt/libvirt_unprivileged.py index 6acdb40f99..d5edd07d25 100644 --- a/virttest/utils_libvirt/libvirt_unprivileged.py +++ b/virttest/utils_libvirt/libvirt_unprivileged.py @@ -1,9 +1,8 @@ import logging import aexpect -from virttest import libvirt_vm -from virttest import remote -from virttest import utils_params + +from virttest import libvirt_vm, remote, utils_params LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirt/libvirt_virtio.py b/virttest/utils_libvirt/libvirt_virtio.py index 4324b1c398..a5c788d22f 100644 --- a/virttest/utils_libvirt/libvirt_virtio.py +++ b/virttest/utils_libvirt/libvirt_virtio.py @@ -8,8 +8,8 @@ from virttest.libvirt_xml import vm_xml from virttest.libvirt_xml.devices import iommu -from virttest.utils_test import libvirt from virttest.utils_libvirt import libvirt_vmxml +from virttest.utils_test import libvirt LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_libvirtd.py b/virttest/utils_libvirtd.py index 22d7e86d83..847f38087a 100644 --- a/virttest/utils_libvirtd.py +++ b/virttest/utils_libvirtd.py @@ -1,16 +1,13 @@ """ Module to control libvirtd service. """ -import re import logging +import re import aexpect -from avocado.utils import path -from avocado.utils import process -from avocado.utils import wait +from avocado.utils import path, process, wait -from virttest import libvirt_version -from virttest import utils_split_daemons +from virttest import libvirt_version, utils_split_daemons from . import remote as remote_old from . import utils_misc diff --git a/virttest/utils_logfile.py b/virttest/utils_logfile.py index 02e63ea49b..d0ed3242bf 100644 --- a/virttest/utils_logfile.py +++ b/virttest/utils_logfile.py @@ -10,8 +10,8 @@ import logging import os import re -import time import threading +import time from avocado.core import exceptions from avocado.utils import aurl diff --git a/virttest/utils_misc.py b/virttest/utils_misc.py index d489ea93a8..d9ebfc0d5b 100644 --- a/virttest/utils_misc.py +++ b/virttest/utils_misc.py @@ -5,32 +5,33 @@ """ from __future__ import division -import time -import string + +import ctypes +import fcntl +import getpass +import inspect +import logging +import math +import os +import platform import random +import re +import select +import shutil +import signal import socket -import os import stat -import signal -import re -import logging +import string import subprocess -import fcntl import sys -import inspect import tarfile -import shutil -import getpass -import ctypes import threading -import platform +import time import traceback -import math -import select -import aexpect - from hashlib import md5 +import aexpect + try: from io import BytesIO except ImportError: @@ -42,25 +43,18 @@ basestring = (str, bytes) from avocado.core import exceptions -from avocado.utils import distro -from avocado.utils import git +from avocado.utils import aurl, distro, download, genio, git, linux_modules, memory from avocado.utils import path as utils_path from avocado.utils import process -from avocado.utils import genio -from avocado.utils import aurl -from avocado.utils import download -from avocado.utils import linux_modules -from avocado.utils import memory from avocado.utils.astring import to_text +# pylint: disable=W0611 # Symlink avocado implementation of process functions -from avocado.utils.process import CmdResult +from avocado.utils.process import kill_process_by_pattern # pylint: disable=W0611 from avocado.utils.process import pid_exists # pylint: disable=W0611 from avocado.utils.process import safe_kill # pylint: disable=W0611 +from avocado.utils.process import CmdResult from avocado.utils.process import kill_process_tree as _kill_process_tree -from avocado.utils.process import kill_process_by_pattern # pylint: disable=W0611 - -# pylint: disable=W0611 from avocado.utils.process import ( process_in_ptree_is_defunct as process_or_children_is_defunct, ) @@ -68,30 +62,29 @@ # Symlink avocado implementation of port-related functions try: - from avocado.utils.network.ports import is_port_free # pylint: disable=W0611 from avocado.utils.network.ports import find_free_port # pylint: disable=W0611 from avocado.utils.network.ports import find_free_ports # pylint: disable=W0611 + from avocado.utils.network.ports import is_port_free # pylint: disable=W0611 except ImportError: from avocado.utils.network import is_port_free # pylint: disable=W0611 from avocado.utils.network import find_free_port # pylint: disable=W0611 from avocado.utils.network import find_free_ports # pylint: disable=W0611 -from virttest import data_dir -from virttest import error_context -from virttest import utils_selinux -from virttest import utils_disk -from virttest import utils_logfile -from virttest import logging_manager -from virttest import kernel_interface - -from virttest.staging import utils_koji -from virttest.staging import service -from virttest.xml_utils import XMLTreeFile - - import six from six.moves import xrange +from virttest import ( + data_dir, + error_context, + kernel_interface, + logging_manager, + utils_disk, + utils_logfile, + utils_selinux, +) +from virttest.staging import service, utils_koji +from virttest.xml_utils import XMLTreeFile + LOG = logging.getLogger("avocado." + __name__) ARCH = platform.machine() @@ -4481,6 +4474,7 @@ def get_sosreport( """ from aexpect import remote from avocado.core import data_dir + from virttest import utils_package if "ubuntu" in get_distro(session=session).lower(): diff --git a/virttest/utils_nbd.py b/virttest/utils_nbd.py index 316bc6fa24..4de6802242 100644 --- a/virttest/utils_nbd.py +++ b/virttest/utils_nbd.py @@ -16,11 +16,8 @@ from avocado.utils import process -from virttest import utils_config -from virttest import utils_libvirtd -from virttest import utils_net - -from virttest.utils_conn import build_server_key, build_CA, build_client_key +from virttest import utils_config, utils_libvirtd, utils_net +from virttest.utils_conn import build_CA, build_client_key, build_server_key LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_net.py b/virttest/utils_net.py index e9e8e387d5..ec54afde44 100644 --- a/virttest/utils_net.py +++ b/virttest/utils_net.py @@ -1,50 +1,45 @@ -import re -import os -import socket -import fcntl import errno -import struct +import fcntl +import hashlib +import ipaddress as pyipaddr +import json import logging -import random import math -import time +import os +import platform +import random +import re import shelve +import shutil import signal +import socket +import struct import sys -import netifaces -import platform +import time import uuid -import hashlib -import shutil -import json -import ipaddress as pyipaddr import aexpect +import netifaces +import six from aexpect import remote - from avocado.core import exceptions from avocado.utils import path as utils_path -from avocado.utils import process -from avocado.utils import stacktrace - -import six +from avocado.utils import process, stacktrace from six.moves import xrange -from virttest import openvswitch -from virttest import data_dir -from virttest import propcan -from virttest import utils_misc -from virttest import arch -from virttest import utils_selinux -from virttest import utils_package - +from virttest import ( + arch, + data_dir, + openvswitch, + propcan, + utils_misc, + utils_package, + utils_selinux, +) from virttest.remote import RemoteRunner -from virttest.staging import utils_memory -from virttest.staging import service +from virttest.staging import service, utils_memory +from virttest.utils_windows import system, virtio_win from virttest.versionable_class import factory -from virttest.utils_windows import virtio_win -from virttest.utils_windows import system - try: unicode diff --git a/virttest/utils_netperf.py b/virttest/utils_netperf.py index c6a566b31b..5f903dce18 100644 --- a/virttest/utils_netperf.py +++ b/virttest/utils_netperf.py @@ -1,15 +1,11 @@ +import logging import ntpath import os -import logging import re import aexpect from aexpect import remote - -from avocado.utils import download -from avocado.utils import aurl -from avocado.utils import wait - +from avocado.utils import aurl, download, wait from six.moves import xrange from . import data_dir diff --git a/virttest/utils_npiv.py b/virttest/utils_npiv.py index 27df40dc77..5fb216bd87 100644 --- a/virttest/utils_npiv.py +++ b/virttest/utils_npiv.py @@ -2,14 +2,12 @@ import os import re import time +from tempfile import mktemp from avocado.core import exceptions from avocado.utils import process -from tempfile import mktemp - -from virttest import utils_misc -from virttest import virsh +from virttest import utils_misc, virsh from virttest.libvirt_xml.devices import hostdev from virttest.libvirt_xml.nodedev_xml import NodedevXML from virttest.utils_test import libvirt diff --git a/virttest/utils_numeric.py b/virttest/utils_numeric.py index 22e6813af2..32d57df598 100644 --- a/virttest/utils_numeric.py +++ b/virttest/utils_numeric.py @@ -1,8 +1,8 @@ from __future__ import division -import re + import math -from decimal import Decimal -from decimal import getcontext +import re +from decimal import Decimal, getcontext def align_value(value, factor=1024): diff --git a/virttest/utils_package.py b/virttest/utils_package.py index 73987dcc61..3cb6f301c5 100644 --- a/virttest/utils_package.py +++ b/virttest/utils_package.py @@ -2,14 +2,13 @@ Package utility for manage package operation on host """ import logging -import aexpect +import aexpect from avocado.core import exceptions from avocado.utils.software_manager import manager from six import string_types -from virttest import utils_misc -from virttest import vt_console +from virttest import utils_misc, vt_console LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_params.py b/virttest/utils_params.py index 80a84af189..a9119f6444 100644 --- a/virttest/utils_params.py +++ b/virttest/utils_params.py @@ -4,10 +4,10 @@ from collections import UserDict as IterableUserDict except ImportError: from UserDict import IterableUserDict + from collections import OrderedDict from avocado.core import exceptions - from six.moves import xrange diff --git a/virttest/utils_pyvmomi.py b/virttest/utils_pyvmomi.py index 2a4663bdc0..5709d2ef85 100644 --- a/virttest/utils_pyvmomi.py +++ b/virttest/utils_pyvmomi.py @@ -6,10 +6,9 @@ """ import datetime import logging - from functools import wraps -from pyVim.connect import SmartConnect, SmartConnectNoSSL, Disconnect +from pyVim.connect import Disconnect, SmartConnect, SmartConnectNoSSL from pyVim.task import WaitForTask from pyVmomi import vim diff --git a/virttest/utils_qemu.py b/virttest/utils_qemu.py index 0a9099ce48..bf69195628 100644 --- a/virttest/utils_qemu.py +++ b/virttest/utils_qemu.py @@ -1,8 +1,8 @@ """ QEMU related utility functions. """ -import re import json +import re from avocado.utils import process diff --git a/virttest/utils_sasl.py b/virttest/utils_sasl.py index ab141a69b1..6586539b80 100644 --- a/virttest/utils_sasl.py +++ b/virttest/utils_sasl.py @@ -6,13 +6,10 @@ import aexpect from aexpect import remote - from avocado.core import exceptions -from avocado.utils import path -from avocado.utils import process +from avocado.utils import path, process -from virttest import propcan -from virttest import virsh +from virttest import propcan, virsh LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_scheduling.py b/virttest/utils_scheduling.py index 1c8b4d0108..6f0eee6a14 100644 --- a/virttest/utils_scheduling.py +++ b/virttest/utils_scheduling.py @@ -3,8 +3,8 @@ :copyright: 2008-2009 Red Hat Inc. """ -import multiprocessing.pool import functools +import multiprocessing.pool def timeout(timeout): diff --git a/virttest/utils_selinux.py b/virttest/utils_selinux.py index 6775ff1ed6..5611eb5bc2 100644 --- a/virttest/utils_selinux.py +++ b/virttest/utils_selinux.py @@ -3,12 +3,10 @@ """ import logging -import re import os +import re -from avocado.utils import process -from avocado.utils import distro - +from avocado.utils import distro, process ubuntu = distro.detect().name == "Ubuntu" diff --git a/virttest/utils_spice.py b/virttest/utils_spice.py index b416ff66eb..1a6b18b0cd 100644 --- a/virttest/utils_spice.py +++ b/virttest/utils_spice.py @@ -2,15 +2,15 @@ Common spice test utility functions. """ -import os import logging -import time +import os import sys +import time from aexpect import ShellCmdError, ShellStatusError from avocado.core import exceptions -from . import utils_net, utils_misc +from . import utils_misc, utils_net LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_split_daemons.py b/virttest/utils_split_daemons.py index aa23335c0b..a71133577c 100644 --- a/virttest/utils_split_daemons.py +++ b/virttest/utils_split_daemons.py @@ -1,18 +1,16 @@ """ Module to control split daemon service. """ +import logging + # pylint: disable=E0611 import re -import logging import aexpect -from avocado.utils import process -from avocado.utils import wait from avocado.core import exceptions +from avocado.utils import process, wait -from virttest import libvirtd_decorator -from virttest import remote -from virttest import utils_misc +from virttest import libvirtd_decorator, remote, utils_misc from virttest.staging import service from virttest.utils_gdb import GDB diff --git a/virttest/utils_sriov.py b/virttest/utils_sriov.py index d8af1b10ae..e6843e5742 100644 --- a/virttest/utils_sriov.py +++ b/virttest/utils_sriov.py @@ -3,14 +3,12 @@ """ import logging -import re import os +import re from avocado.core import exceptions -from virttest import utils_misc -from virttest import utils_net -from virttest import utils_package +from virttest import utils_misc, utils_net, utils_package LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_stress.py b/virttest/utils_stress.py index e6a0873154..58e61060c9 100644 --- a/virttest/utils_stress.py +++ b/virttest/utils_stress.py @@ -1,18 +1,16 @@ +import logging import os import random -import time import threading -import logging +import time -from avocado.utils import cpu from avocado.core import exceptions +from avocado.utils import cpu -from virttest import virsh from virttest import cpu as cpuutil -from virttest import utils_net -from virttest import utils_package -from virttest.utils_test import libvirt +from virttest import utils_net, utils_package, virsh from virttest.libvirt_xml.devices.disk import Disk +from virttest.utils_test import libvirt LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_switchdev.py b/virttest/utils_switchdev.py index 9e235f758e..a9894d549c 100644 --- a/virttest/utils_switchdev.py +++ b/virttest/utils_switchdev.py @@ -3,14 +3,13 @@ :copyright: Red Hat Inc. """ -import os import logging +import os from avocado.utils import process from virttest import utils_sriov - LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_test/__init__.py b/virttest/utils_test/__init__.py index c7c5a0b89f..0a98852fb1 100755 --- a/virttest/utils_test/__init__.py +++ b/virttest/utils_test/__init__.py @@ -17,50 +17,43 @@ """ from __future__ import division + +import ast +import functools import glob import locale import logging import os import re +import shutil import signal +import subprocess import tempfile import threading import time -import subprocess -import shutil -import ast -import functools import aexpect from aexpect import remote - from avocado.core import exceptions -from avocado.utils import process -from avocado.utils import aurl -from avocado.utils import download -from avocado.utils import crypto -from avocado.utils import path -from avocado.utils import archive - +from avocado.utils import archive, aurl, crypto, download, path, process from six.moves import xrange # Import from the top level virttest namespace -from virttest import asset -from virttest import bootstrap -from virttest import data_dir -from virttest import error_context -from virttest import qemu_virtio_port +from virttest import asset, bootstrap, data_dir, error_context, qemu_virtio_port from virttest import remote as remote_old -from virttest import scan_autotest_results -from virttest import storage -from virttest import utils_misc -from virttest import utils_net -from virttest import virt_vm -from virttest import utils_package -from virttest.utils_iptables import Iptables -from virttest import data_dir +from virttest import ( + scan_autotest_results, + storage, + utils_misc, + utils_net, + utils_package, + virt_vm, +) + +# lazy imports for dependencies that are not needed in all modes of use +from virttest._wrappers import import_module, lazy_import from virttest.staging import utils_memory -from virttest._wrappers import import_module +from virttest.utils_iptables import Iptables # Get back to importing submodules # This is essential for accessing these submodules directly from @@ -71,9 +64,6 @@ # pylint: disable=unused-import from virttest.utils_test import qemu -# lazy imports for dependencies that are not needed in all modes of use -from virttest._wrappers import lazy_import - libvirt = lazy_import("virttest.utils_test.libvirt") libguestfs = lazy_import("virttest.utils_test.libguestfs") diff --git a/virttest/utils_test/libguestfs.py b/virttest/utils_test/libguestfs.py index cae4082f90..2dea94f903 100644 --- a/virttest/utils_test/libguestfs.py +++ b/virttest/utils_test/libguestfs.py @@ -1,14 +1,13 @@ -import re -import os import logging +import os +import re from avocado.core import exceptions from avocado.utils import process -from .. import virsh, virt_vm, libvirt_vm, data_dir -from .. import utils_net, xml_utils +from .. import data_dir, libvirt_vm, qemu_storage from .. import utils_libguestfs as lgf -from .. import qemu_storage +from .. import utils_net, virsh, virt_vm, xml_utils from ..libvirt_xml import vm_xml, xcepts LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_test/libvirt.py b/virttest/utils_test/libvirt.py index af8e67aee2..ec3f41abc3 100644 --- a/virttest/utils_test/libvirt.py +++ b/virttest/utils_test/libvirt.py @@ -17,70 +17,68 @@ """ from __future__ import division -import re -import os + import ast import logging -import shutil -import time -import sys -import aexpect +import os import platform import random -import string +import re import shutil +import string +import sys +import time +import aexpect +import six from aexpect import remote - from avocado.core import exceptions +from avocado.utils import distro, linux_modules from avocado.utils import path as utils_path -from avocado.utils import process -from avocado.utils import stacktrace -from avocado.utils import linux_modules -from avocado.utils import distro +from avocado.utils import process, stacktrace from avocado.utils.astring import to_text -import six - -from virttest import virsh -from virttest import xml_utils -from virttest import iscsi -from virttest import nfs -from virttest import utils_misc -from virttest import utils_selinux -from virttest import libvirt_storage -from virttest import utils_net -from virttest import gluster -from virttest import test_setup -from virttest import data_dir -from virttest import utils_libvirtd -from virttest import utils_config -from virttest import utils_split_daemons +from virttest import data_dir, gluster, iscsi, libvirt_storage, nfs from virttest import remote as remote_old +from virttest import ( + test_setup, + utils_config, + utils_libvirtd, + utils_misc, + utils_net, + utils_selinux, + utils_split_daemons, + virsh, + xml_utils, +) +from virttest.libvirt_xml import ( + IPXML, + CapabilityXML, + NetworkXML, + base, + network_xml, + nwfilter_xml, + pool_xml, + secret_xml, + vm_xml, + vol_xml, + xcepts, +) +from virttest.libvirt_xml.devices import ( + channel, + controller, + disk, + hostdev, + interface, + panic, + redirdev, + rng, + seclabel, + tpm, + vsock, +) from virttest.staging import lv_utils from virttest.utils_libvirtd import service_libvirtd_control -from virttest.libvirt_xml import vm_xml -from virttest.libvirt_xml import network_xml -from virttest.libvirt_xml import xcepts -from virttest.libvirt_xml import NetworkXML -from virttest.libvirt_xml import IPXML -from virttest.libvirt_xml import pool_xml -from virttest.libvirt_xml import nwfilter_xml -from virttest.libvirt_xml import vol_xml -from virttest.libvirt_xml import secret_xml -from virttest.libvirt_xml import CapabilityXML -from virttest.libvirt_xml import base -from virttest.libvirt_xml.devices import disk -from virttest.libvirt_xml.devices import hostdev -from virttest.libvirt_xml.devices import controller -from virttest.libvirt_xml.devices import redirdev -from virttest.libvirt_xml.devices import seclabel -from virttest.libvirt_xml.devices import channel -from virttest.libvirt_xml.devices import interface -from virttest.libvirt_xml.devices import panic -from virttest.libvirt_xml.devices import tpm -from virttest.libvirt_xml.devices import vsock -from virttest.libvirt_xml.devices import rng ping = utils_net.ping diff --git a/virttest/utils_test/libvirt_domjobinfo.py b/virttest/utils_test/libvirt_domjobinfo.py index 9b7a36f4b0..efbd42d3a9 100644 --- a/virttest/utils_test/libvirt_domjobinfo.py +++ b/virttest/utils_test/libvirt_domjobinfo.py @@ -2,9 +2,9 @@ Virsh domjobinfo command related utility functions """ -import re -import math import logging +import math +import re from avocado.core import exceptions diff --git a/virttest/utils_test/qemu/__init__.py b/virttest/utils_test/qemu/__init__.py index a53aea2a92..57fca44fd6 100644 --- a/virttest/utils_test/qemu/__init__.py +++ b/virttest/utils_test/qemu/__init__.py @@ -16,19 +16,17 @@ :copyright: 2008-2013 Red Hat Inc. """ +import logging import os import re -import six import time -import logging from functools import reduce +import six from avocado.core import exceptions from avocado.utils import cpu as cpuutil -from virttest import error_context -from virttest import utils_misc -from virttest import qemu_monitor +from virttest import error_context, qemu_monitor, utils_misc from virttest.qemu_devices import qdevices from virttest.staging import utils_memory diff --git a/virttest/utils_test/qemu/migration.py b/virttest/utils_test/qemu/migration.py index 7b8aa83d3e..b0add725cf 100644 --- a/virttest/utils_test/qemu/migration.py +++ b/virttest/utils_test/qemu/migration.py @@ -8,10 +8,11 @@ import fcntl import logging import os +import re import socket import threading import time -import re + import six try: @@ -20,21 +21,15 @@ import cPickle from aexpect import remote - from avocado.core import exceptions -from avocado.utils import crypto -from avocado.utils import data_factory +from avocado.utils import crypto, data_factory from avocado.utils import path as utils_path from avocado.utils import process from avocado.utils.data_structures import DataSize -from virttest import data_dir -from virttest import storage -from virttest import utils_test -from virttest import utils_misc -from virttest import env_process +from virttest import data_dir, env_process from virttest import error_context as error -from virttest import qemu_migration +from virttest import qemu_migration, storage, utils_misc, utils_test try: import aexpect diff --git a/virttest/utils_time.py b/virttest/utils_time.py index 981c197152..af61990c74 100644 --- a/virttest/utils_time.py +++ b/virttest/utils_time.py @@ -1,12 +1,10 @@ import logging import re -from avocado.utils import path -from avocado.utils import process from avocado.core import exceptions +from avocado.utils import path, process -from virttest import error_context -from virttest import utils_test +from virttest import error_context, utils_test # command `grep --color` may have alias name `grep` in some systems, # so get explicit command 'grep' with path diff --git a/virttest/utils_v2v.py b/virttest/utils_v2v.py index b5d866cb7d..63d8dea87a 100644 --- a/virttest/utils_v2v.py +++ b/virttest/utils_v2v.py @@ -11,33 +11,27 @@ import os import pwd import random -import uuid import re import shutil import tempfile import time +import uuid import aexpect - from aexpect import remote -from avocado.utils import path -from avocado.utils import process -from avocado.utils.astring import to_text from avocado.core import exceptions +from avocado.utils import path, process +from avocado.utils.astring import to_text -from virttest import libvirt_vm as lvirt -from virttest import ovirt -from virttest import virsh -from virttest import ppm_utils from virttest import data_dir +from virttest import libvirt_vm as lvirt +from virttest import ovirt, ppm_utils from virttest import remote as remote_old -from virttest import utils_misc -from virttest import ssh_key -from virttest.utils_test import libvirt +from virttest import ssh_key, utils_misc, virsh from virttest.libvirt_xml import vm_xml +from virttest.utils_misc import asterisk_passwd, compare_md5 +from virttest.utils_test import libvirt from virttest.utils_version import VersionInterval -from virttest.utils_misc import asterisk_passwd -from virttest.utils_misc import compare_md5 try: V2V_EXEC = path.find_command("virt-v2v") diff --git a/virttest/utils_vdpa.py b/virttest/utils_vdpa.py index 647f6a84a7..8e473786fe 100644 --- a/virttest/utils_vdpa.py +++ b/virttest/utils_vdpa.py @@ -11,11 +11,7 @@ from avocado.core import exceptions from avocado.utils import process -from virttest import openvswitch -from virttest import utils_misc -from virttest import utils_net -from virttest import utils_sriov -from virttest import utils_switchdev +from virttest import openvswitch, utils_misc, utils_net, utils_sriov, utils_switchdev from virttest.utils_kernel_module import KernelModuleHandler from virttest.versionable_class import factory diff --git a/virttest/utils_version.py b/virttest/utils_version.py index ce83f66bbf..7540f1b64a 100644 --- a/virttest/utils_version.py +++ b/virttest/utils_version.py @@ -1,8 +1,8 @@ import operator import re -from distutils.version import ( +from distutils.version import ( # pylint: disable=no-name-in-module,import-error LooseVersion, -) # pylint: disable=no-name-in-module,import-error +) class VersionInterval(object): diff --git a/virttest/utils_virtio_port.py b/virttest/utils_virtio_port.py index be8c5773e7..dba0fcc1ab 100644 --- a/virttest/utils_virtio_port.py +++ b/virttest/utils_virtio_port.py @@ -2,9 +2,7 @@ from six.moves import xrange -from . import env_process -from . import error_context -from . import qemu_virtio_port +from . import env_process, error_context, qemu_virtio_port LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_vsock.py b/virttest/utils_vsock.py index 9a62ccdbd2..ae322ffcfe 100644 --- a/virttest/utils_vsock.py +++ b/virttest/utils_vsock.py @@ -1,7 +1,7 @@ -import os +import errno import fcntl +import os import struct -import errno from virttest import arch diff --git a/virttest/utils_windows/drive.py b/virttest/utils_windows/drive.py index 40d776259c..f43ade4634 100644 --- a/virttest/utils_windows/drive.py +++ b/virttest/utils_windows/drive.py @@ -2,9 +2,10 @@ Windows drive utilities """ -from . import wmic from virttest import utils_misc +from . import wmic + def _logical_disks(session, cond=None, props=None): cmd = wmic.make_query("LogicalDisk", cond, props, get_swch=wmic.FMT_TYPE_LIST) diff --git a/virttest/utils_windows/virtio_win.py b/virttest/utils_windows/virtio_win.py index fe7039cf52..0724087667 100644 --- a/virttest/utils_windows/virtio_win.py +++ b/virttest/utils_windows/virtio_win.py @@ -2,13 +2,12 @@ Windows virtio-win utilities """ -import re import logging +import re -from . import drive -from . import system from avocado.core import exceptions +from . import drive, system ARCH_MAP_ISO = {"32-bit": "x86", "64-bit": "amd64"} ARCH_MAP_VFD = {"32-bit": "i386", "64-bit": "amd64"} diff --git a/virttest/utils_windows/wmic.py b/virttest/utils_windows/wmic.py index f788febfab..8e77db6aa2 100644 --- a/virttest/utils_windows/wmic.py +++ b/virttest/utils_windows/wmic.py @@ -4,7 +4,6 @@ import re - _WMIC_CMD = "wmic" FMT_TYPE_LIST = "/format:list" diff --git a/virttest/utils_zcrypt.py b/virttest/utils_zcrypt.py index c202cad967..ffbb7fcac3 100644 --- a/virttest/utils_zcrypt.py +++ b/virttest/utils_zcrypt.py @@ -30,10 +30,11 @@ mask_helper.return_to_host_all() """ -from uuid import uuid1 from os.path import join +from uuid import uuid1 from avocado.utils import process + from virttest.utils_misc import cmd_status_output # timeout value in seconds for any command run diff --git a/virttest/video_maker.py b/virttest/video_maker.py index d5d72b49ca..c68649af7e 100644 --- a/virttest/video_maker.py +++ b/virttest/video_maker.py @@ -8,12 +8,11 @@ """ -import os -import time import glob import logging +import os import re - +import time __all__ = ["get_video_maker_klass", "video_maker"] diff --git a/virttest/virsh.py b/virttest/virsh.py index ff6783b419..1c5c192b60 100644 --- a/virttest/virsh.py +++ b/virttest/virsh.py @@ -21,31 +21,24 @@ :copyright: 2012 Red Hat Inc. """ -import signal +import base64 +import inspect +import locale import logging import os import re -import weakref -import time import select -import locale -import base64 -import inspect - +import signal +import time +import weakref from functools import wraps import aexpect from aexpect import remote - -from avocado.utils import path -from avocado.utils import process - +from avocado.utils import path, process from six.moves import urllib -from virttest import propcan -from virttest import utils_misc -from virttest import data_dir - +from virttest import data_dir, propcan, utils_misc LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/virt_admin.py b/virttest/virt_admin.py index f34f87ef78..af25f288e1 100644 --- a/virttest/virt_admin.py +++ b/virttest/virt_admin.py @@ -21,24 +21,18 @@ :copyright: 2012 Red Hat Inc. """ -import signal import logging import re -import weakref -import time import select +import signal +import time +import weakref import aexpect from aexpect import remote +from avocado.utils import path, process -from avocado.utils import path -from avocado.utils import process - -from virttest import propcan -from virttest import utils_misc -from virttest import utils_split_daemons -from virttest import utils_config - +from virttest import propcan, utils_config, utils_misc, utils_split_daemons # list of symbol names NOT to wrap as Virtadmin class methods # Everything else from globals() will become a method of Virtadmin class diff --git a/virttest/virt_vm.py b/virttest/virt_vm.py index e46638d716..7dfe23b879 100644 --- a/virttest/virt_vm.py +++ b/virttest/virt_vm.py @@ -1,31 +1,23 @@ from __future__ import division -import logging -import time + +import functools import glob +import logging import os import re import socket +import time import traceback -import functools +import six from aexpect import remote -from aexpect.exceptions import ShellError -from aexpect.exceptions import ExpectError - +from aexpect.exceptions import ExpectError, ShellError from avocado.core import exceptions - -import six from six.moves import xrange -from virttest import utils_logfile -from virttest import utils_misc -from virttest import utils_net +from virttest import data_dir, error_context, ppm_utils from virttest import remote as remote_old -from virttest import ppm_utils -from virttest import data_dir -from virttest import error_context -from virttest import vt_console - +from virttest import utils_logfile, utils_misc, utils_net, vt_console LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/vt_console.py b/virttest/vt_console.py index 23109a6f66..02b8ce7ca7 100644 --- a/virttest/vt_console.py +++ b/virttest/vt_console.py @@ -1,7 +1,6 @@ import threading import time - from aexpect import remote diff --git a/virttest/vt_utils/block.py b/virttest/vt_utils/block.py index bcbcf5cedf..9fc73e56b5 100644 --- a/virttest/vt_utils/block.py +++ b/virttest/vt_utils/block.py @@ -16,8 +16,8 @@ import platform import re -from avocado.utils import process -from avocado.utils import wait +from avocado.utils import process, wait + from virttest import utils_numeric from virttest.vt_utils import filesystem diff --git a/virttest/vt_utils/filesystem.py b/virttest/vt_utils/filesystem.py index b90ed99a95..d37fbb1ea2 100644 --- a/virttest/vt_utils/filesystem.py +++ b/virttest/vt_utils/filesystem.py @@ -16,6 +16,7 @@ import re from avocado.utils import process + from virttest import utils_numeric from virttest.vt_utils import block diff --git a/virttest/xml_utils.py b/virttest/xml_utils.py index 6cbfc7dbe7..fe4a1ef25e 100644 --- a/virttest/xml_utils.py +++ b/virttest/xml_utils.py @@ -37,14 +37,15 @@ class should be an ElementTree.TreeBuilder class or subclass. Instances """ import io +import logging import os import shutil -import tempfile import string -import logging -from six import StringIO -from xml.parsers import expat +import tempfile from xml.etree import ElementTree +from xml.parsers import expat + +from six import StringIO # Also used by unittests TMPPFX = "xml_utils_temp_" diff --git a/virttest/yumrepo.py b/virttest/yumrepo.py index a69c3ad92e..af387487da 100644 --- a/virttest/yumrepo.py +++ b/virttest/yumrepo.py @@ -6,7 +6,6 @@ import os - __all__ = ["REPO_DIR", "YumRepo"]