diff --git a/test/mod/test_mounts.py b/test/mod/test_mounts.py index 156b7663..f462f73b 100644 --- a/test/mod/test_mounts.py +++ b/test/mod/test_mounts.py @@ -1,7 +1,7 @@ from unittest.mock import Mock -from osbuild.mounts import Mount from osbuild.meta import ModuleInfo +from osbuild.mounts import Mount def test_mount_calc_id_is_stable(): diff --git a/test/mod/test_testutil_imports.py b/test/mod/test_testutil_imports.py index c4f75852..7f46fc57 100644 --- a/test/mod/test_testutil_imports.py +++ b/test/mod/test_testutil_imports.py @@ -4,7 +4,6 @@ from osbuild.testutil.imports import import_module_from_path - canary = "import-went-okay" diff --git a/test/mod/test_util_mnt.py b/test/mod/test_util_mnt.py index 435eccc4..91d6828d 100644 --- a/test/mod/test_util_mnt.py +++ b/test/mod/test_util_mnt.py @@ -3,7 +3,7 @@ import os import pytest from osbuild.mounts import FileSystemMountService -from osbuild.util.mnt import mount, MountGuard +from osbuild.util.mnt import MountGuard, mount @pytest.mark.skipif(os.getuid() != 0, reason="root only") diff --git a/test/run/test_mount.py b/test/run/test_mount.py index cebf52a7..05b5f65f 100755 --- a/test/run/test_mount.py +++ b/test/run/test_mount.py @@ -15,8 +15,7 @@ from contextlib import contextmanager import pytest -from osbuild import devices, host, meta, mounts -from osbuild import testutil +from osbuild import devices, host, meta, mounts, testutil from ..test import TestBase diff --git a/test/run/test_stages.py b/test/run/test_stages.py index 1e944392..7c7b872a 100644 --- a/test/run/test_stages.py +++ b/test/run/test_stages.py @@ -17,11 +17,11 @@ import xml from collections.abc import Mapping from typing import Callable, Dict, List, Optional -from osbuild.util import checksum, selinux from osbuild.testutil import has_executable -from .test_assemblers import mount +from osbuild.util import checksum, selinux from .. import initrd, test +from .test_assemblers import mount def have_sfdisk_with_json():