Skip to content

Commit 9fc525f

Browse files
committed
test,vmtest: run isort
1 parent 0a5c722 commit 9fc525f

File tree

8 files changed

+36
-44
lines changed

8 files changed

+36
-44
lines changed

test/conftest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
from test.testcases import TestCase
2+
13
import pytest
24

3-
from test.testcases import TestCase
45
from vmtest.util import get_free_port
56

67

test/test_build_cross.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
import platform
2-
3-
import pytest
4-
2+
from test.test_build_disk import ( # pylint: disable=unused-import
3+
assert_disk_image_boots, build_container_fixture, gpg_conf_fixture,
4+
image_type_fixture, registry_conf_fixture, shared_tmpdir_fixture)
55
from test.testcases import gen_testcases
66

7-
from test.test_build_disk import ( # pylint: disable=unused-import
8-
assert_disk_image_boots,
9-
build_container_fixture,
10-
gpg_conf_fixture,
11-
image_type_fixture,
12-
registry_conf_fixture,
13-
shared_tmpdir_fixture,
14-
)
7+
import pytest
158

169

1710
# This testcase is not part of "test_build_disk.py:test_image_boots"

test/test_build_disk.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,20 @@
99
import subprocess
1010
import tempfile
1111
import uuid
12-
from contextlib import contextmanager, ExitStack
13-
from typing import NamedTuple
12+
from contextlib import ExitStack, contextmanager
1413
from dataclasses import dataclass
15-
16-
import pytest
1714
# local test utils
1815
from test import testutil
19-
from .containerbuild import build_container_fixture # pylint: disable=unused-import
20-
from .testcases import CLOUD_BOOT_IMAGE_TYPES, DISK_IMAGE_TYPES, gen_testcases
16+
from typing import NamedTuple
17+
18+
import pytest
19+
2120
import vmtest.util
22-
from vmtest.vm import AWS_REGION, AWS, QEMU
21+
from vmtest.vm import AWS, AWS_REGION, QEMU
22+
23+
from .containerbuild import \
24+
build_container_fixture # pylint: disable=unused-import
25+
from .testcases import CLOUD_BOOT_IMAGE_TYPES, DISK_IMAGE_TYPES, gen_testcases
2326

2427
if not testutil.has_executable("podman"):
2528
pytest.skip("no podman, skipping integration tests that required podman", allow_module_level=True)

test/test_build_iso.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22
import platform
33
import subprocess
44
from contextlib import ExitStack
5-
6-
import pytest
75
# local test utils
86
from test import testutil
9-
from .containerbuild import build_container_fixture # pylint: disable=unused-import
7+
from test.test_build_disk import ( # pylint: disable=unused-import
8+
ImageBuildResult, assert_kernel_args, gpg_conf_fixture, image_type_fixture,
9+
registry_conf_fixture, shared_tmpdir_fixture)
1010
from test.testcases import gen_testcases
11+
12+
import pytest
13+
1114
from vmtest.vm import QEMU
1215

13-
from test.test_build_disk import (
14-
assert_kernel_args,
15-
ImageBuildResult,
16-
)
17-
from test.test_build_disk import ( # pylint: disable=unused-import
18-
gpg_conf_fixture,
19-
image_type_fixture,
20-
registry_conf_fixture,
21-
shared_tmpdir_fixture,
22-
)
16+
from .containerbuild import \
17+
build_container_fixture # pylint: disable=unused-import
2318

2419

2520
@pytest.mark.skipif(platform.system() != "Linux", reason="boot test only runs on linux right now")

test/test_manifest.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
import platform
88
import subprocess
99
import textwrap
10-
11-
import pytest
12-
1310
from test import testutil
1411
from test.containerbuild import build_container_fixture as _
1512
from test.containerbuild import make_container
1613
from test.testcases import gen_testcases
1714

15+
import pytest
16+
1817
if not testutil.has_executable("podman"):
1918
pytest.skip("no podman, skipping integration tests that required podman", allow_module_level=True)
2019
if not testutil.can_start_rootful_containers():

test/test_opts.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import os
22
import platform
33
import subprocess
4-
5-
import pytest
64
from test import testutil
75
# pylint: disable=unused-import
8-
from test.containerbuild import build_container_fixture, build_fake_container_fixture
6+
from test.containerbuild import (build_container_fixture,
7+
build_fake_container_fixture)
8+
9+
import pytest
910

1011

1112
@pytest.fixture(name="container_storage", scope="session")

test/test_progress.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import subprocess
2-
3-
import pytest
4-
52
from test import testutil
6-
# pylint: disable=unused-import,duplicate-code
7-
from test.test_opts import container_storage_fixture
8-
from test.containerbuild import (
3+
from test.containerbuild import ( # pylint: disable=unused-import
94
build_container_fixture,
105
build_erroring_container_fixture,
116
build_fake_container_fixture,
127
)
8+
# pylint: disable=unused-import,duplicate-code
9+
from test.test_opts import container_storage_fixture
10+
11+
import pytest
1312

1413

1514
def test_progress_debug(tmp_path, build_fake_container):

vmtest/vm.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import paramiko
1313
from botocore.exceptions import ClientError
1414
from paramiko.client import AutoAddPolicy, SSHClient
15+
1516
from vmtest.util import get_free_port, wait_ssh_ready
1617

1718
AWS_REGION = "us-east-1"

0 commit comments

Comments
 (0)