Revert "Use fully qualified imports in tests."

Seems like this also breaks frozen tests...
This reverts commit c7fdcc92b8.
This commit is contained in:
Florian Bruhin 2015-12-01 22:45:59 +01:00
parent 109984c96e
commit 5817b47f75
13 changed files with 19 additions and 19 deletions

View File

@ -31,10 +31,10 @@ import warnings
import pytest
import tests.helpers.stubs as stubsmod
from tests.helpers import logfail
from tests.helpers.logfail import fail_on_logging
from tests.helpers.messagemock import message_mock
import helpers.stubs as stubsmod
from helpers import logfail
from helpers.logfail import fail_on_logging
from helpers.messagemock import message_mock
from qutebrowser.config import config
from qutebrowser.utils import objreg

View File

@ -20,7 +20,7 @@
import pytest
from tests.helpers import utils
from helpers import utils # pylint: disable=import-error
@pytest.mark.parametrize('val1, val2', [

View File

@ -21,5 +21,5 @@
"""Things needed for integration testing."""
from tests.integration.webserver import httpbin, httpbin_after_test
from tests.integration.quteprocess import quteproc_process, quteproc
from webserver import httpbin, httpbin_after_test
from quteprocess import quteproc_process, quteproc

View File

@ -33,7 +33,7 @@ import yaml
import pytest_bdd as bdd
from PyQt5.QtGui import QClipboard
from tests.helpers import utils
from helpers import utils # pylint: disable=import-error
def _clipboard_mode(qapp, what):

View File

@ -21,8 +21,8 @@ import pytest
import pytest_bdd as bdd
# pylint: disable=unused-import,line-too-long
from tests.integration.features.test_yankpaste import skip_with_broken_clipboard
# pylint: disable=unused-import
from test_yankpaste import skip_with_broken_clipboard
# https://github.com/The-Compiler/qutebrowser/issues/1124#issuecomment-158073581

View File

@ -21,7 +21,7 @@ import os.path
import pytest_bdd as bdd
from tests.helpers import utils
from helpers import utils # pylint: disable=import-error
bdd.scenarios('urlmarks.feature')

View File

@ -32,7 +32,7 @@ import yaml
import pytest
from PyQt5.QtCore import pyqtSignal, QUrl
from tests.integration import testprocess
import testprocess # pylint: disable=import-error
from qutebrowser.misc import ipc
from qutebrowser.utils import log, utils

View File

@ -24,8 +24,8 @@ import datetime
import pytest
from tests.integration import quteprocess
from tests.integration import testprocess
import quteprocess
import testprocess
from qutebrowser.utils import log

View File

@ -27,7 +27,7 @@ import datetime
import pytest
from PyQt5.QtCore import QProcess
from tests.integration import testprocess
import testprocess
pytestmark = [pytest.mark.not_frozen]

View File

@ -27,7 +27,7 @@ import pytestqt.plugin
from PyQt5.QtCore import pyqtSlot, pyqtSignal, QProcess, QObject, QElapsedTimer
from PyQt5.QtTest import QSignalSpy
from tests.helpers import utils
from helpers import utils # pylint: disable=import-error
class InvalidLine(Exception):

View File

@ -27,7 +27,7 @@ import os.path
import pytest
from PyQt5.QtCore import pyqtSignal
from tests.integration import testprocess
import testprocess # pylint: disable=import-error
class Request(testprocess.Line):

View File

@ -39,7 +39,7 @@ from PyQt5.QtTest import QSignalSpy
import qutebrowser
from qutebrowser.misc import ipc
from qutebrowser.utils import objreg, qtutils
from tests.helpers import stubs
from helpers import stubs # pylint: disable=import-error
Args = collections.namedtuple('Args', 'basedir')

View File

@ -38,7 +38,7 @@ from PyQt5.QtCore import (QDataStream, QPoint, QUrl, QByteArray, QIODevice,
from qutebrowser import qutebrowser
from qutebrowser.utils import qtutils
from tests.unit.utils import overflow_test_cases
import overflow_test_cases
@pytest.mark.parametrize('qversion, version, op, expected', [