From abf0bf998dcb20807195018bfdd7abca2930dbbd Mon Sep 17 00:00:00 2001 From: John Snow Date: Thu, 27 Jun 2019 17:28:14 -0400 Subject: python/qemu: split QEMUMachine out from underneath __init__.py It's not obvious that something named __init__.py actually houses important code that isn't relevant to python packaging glue. Move the QEMUMachine and related error classes out into their own module. Adjust users to the new import location. Signed-off-by: John Snow Message-Id: <20190627212816.27298-2-jsnow@redhat.com> Signed-off-by: Eduardo Habkost --- tests/acceptance/avocado_qemu/__init__.py | 2 +- tests/acceptance/virtio_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/acceptance') diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 2b236a1..aee5d82 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -17,7 +17,7 @@ import avocado SRC_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..', '..', '..') sys.path.append(os.path.join(SRC_ROOT_DIR, 'python')) -from qemu import QEMUMachine +from qemu.machine import QEMUMachine def is_readable_executable_file(path): return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK) diff --git a/tests/acceptance/virtio_version.py b/tests/acceptance/virtio_version.py index 8b97453..33593c2 100644 --- a/tests/acceptance/virtio_version.py +++ b/tests/acceptance/virtio_version.py @@ -12,7 +12,7 @@ import sys import os sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) -from qemu import QEMUMachine +from qemu.machine import QEMUMachine from avocado_qemu import Test # Virtio Device IDs: -- cgit v1.1