From 15f37827a16f857b01b2bdf97d7c34b3f00f47b5 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Tue, 18 Oct 2022 07:35:47 -0400 Subject: [PATCH] test: fix imports The tests are stale and will not run successfully against the current code. This will be addressed in a future series of patches. Signed-off-by: Eric Callahan --- tests/conftest.py | 6 +++--- tests/test_config.py | 8 ++++---- tests/test_database.py | 4 ++-- tests/test_klippy_connection.py | 6 +++--- tests/test_server.py | 12 ++++++------ 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 742a81a..4d8e19b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -10,9 +10,9 @@ import shlex import tempfile import subprocess from typing import Iterator, Dict, AsyncIterator, Any -from moonraker import Server -from eventloop import EventLoop -import utils +from moonraker.server import Server +from moonraker.eventloop import EventLoop +from moonraker import utils import dbtool from fixtures import KlippyProcess, HttpClient, WebsocketClient diff --git a/tests/test_config.py b/tests/test_config.py index cc31db8..4496517 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -5,10 +5,10 @@ import hashlib import confighelper import shutil import time -from confighelper import ConfigError -from moonraker import Server -from utils import ServerError -from components import gpio +from moonraker.confighelper import ConfigError +from moonraker.server import Server +from moonraker.utils import ServerError +from moonraker.components import gpio from mocks import MockGpiod from typing import TYPE_CHECKING, Dict if TYPE_CHECKING: diff --git a/tests/test_database.py b/tests/test_database.py index 50b8d85..70520ca 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -5,8 +5,8 @@ import pytest_asyncio import asyncio import copy from inspect import isawaitable -from moonraker import Server -from utils import ServerError +from moonraker.server import Server +from moonraker.utils import ServerError from typing import TYPE_CHECKING, AsyncIterator, Dict, Any, Iterator if TYPE_CHECKING: diff --git a/tests/test_klippy_connection.py b/tests/test_klippy_connection.py index 4b6122f..0a9af62 100644 --- a/tests/test_klippy_connection.py +++ b/tests/test_klippy_connection.py @@ -3,12 +3,12 @@ import pytest import asyncio import pathlib from typing import TYPE_CHECKING, Dict -from moonraker import ServerError -from klippy_connection import KlippyRequest +from moonraker.server import ServerError +from moonraker.klippy_connection import KlippyRequest from mocks import MockReader, MockWriter if TYPE_CHECKING: - from moonraker import Server + from server import Server from conftest import KlippyProcess @pytest.mark.usefixtures("klippy") diff --git a/tests/test_server.py b/tests/test_server.py index 7b30daa..b32b68a 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -6,12 +6,12 @@ import socket import pathlib from collections import namedtuple -from moonraker import CORE_COMPONENTS, Server, API_VERSION -from moonraker import main as servermain -from eventloop import EventLoop -from utils import ServerError -from confighelper import ConfigError -from components.klippy_apis import KlippyAPI +from moonraker.server import CORE_COMPONENTS, Server, API_VERSION +from moonraker.server import main as servermain +from moonraker.eventloop import EventLoop +from moonraker.utils import ServerError +from moonraker.confighelper import ConfigError +from moonraker.components.klippy_apis import KlippyAPI from mocks import MockComponent, MockWebsocket from typing import (