Change imports in tests.core

This commit is contained in:
Dmitri Bogomolov 2021-05-30 21:58:33 +03:00
parent 30f3c5cc3c
commit 8c1b92cb78
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13

View File

@ -15,23 +15,23 @@ import threading
import time import time
import unittest import unittest
import protocol from pybitmessage import (
import state helper_addressbook, helper_sent, protocol, state
import helper_sent )
import helper_addressbook from pybitmessage.bmconfigparser import BMConfigParser
from pybitmessage.helper_msgcoding import MsgEncode, MsgDecode
from pybitmessage.helper_sql import sqlQuery
from pybitmessage.network import asyncore_pollchoose as asyncore, knownnodes
from pybitmessage.network.bmproto import BMProto
from pybitmessage.network.connectionpool import BMConnectionPool
from pybitmessage.network.node import Node, Peer
from pybitmessage.network.tcp import (
Socks4aBMConnection, Socks5BMConnection, TCPConnection
)
from pybitmessage.queues import excQueue
from pybitmessage.version import softwareVersion
from bmconfigparser import BMConfigParser from .common import cleanup
from helper_msgcoding import MsgEncode, MsgDecode
from helper_sql import sqlQuery
from network import asyncore_pollchoose as asyncore, knownnodes
from network.bmproto import BMProto
from network.connectionpool import BMConnectionPool
from network.node import Node, Peer
from network.tcp import Socks4aBMConnection, Socks5BMConnection, TCPConnection
from queues import excQueue
from version import softwareVersion
from common import cleanup
try: try:
socket.socket().bind(('127.0.0.1', 9050)) socket.socket().bind(('127.0.0.1', 9050))
@ -397,11 +397,11 @@ def run():
loader.sortTestMethodsUsing = None loader.sortTestMethodsUsing = None
suite = loader.loadTestsFromTestCase(TestCore) suite = loader.loadTestsFromTestCase(TestCore)
try: try:
import bitmessageqt.tests from .bitmessageqt import tests
except ImportError: except ImportError:
pass pass
else: else:
qt_tests = loader.loadTestsFromModule(bitmessageqt.tests) qt_tests = loader.loadTestsFromModule(tests)
suite.addTests(qt_tests) suite.addTests(qt_tests)
def keep_exc(ex_cls, exc, tb): # pylint: disable=unused-argument def keep_exc(ex_cls, exc, tb): # pylint: disable=unused-argument