From 52ee45669261d15f4a958fe6aa3bb7065c2b8ac7 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 29 Apr 2013 19:45:25 +0200 Subject: [PATCH] tests: Import unittest directly from the stdlib --- tests/__init__.py | 1 - tests/audio/actor_test.py | 4 +++- tests/audio/listener_test.py | 3 +-- tests/backends/base/library.py | 4 +++- tests/backends/base/playback.py | 2 +- tests/backends/base/playlists.py | 4 ++-- tests/backends/listener_test.py | 3 +-- tests/backends/local/events_test.py | 4 +++- tests/backends/local/library_test.py | 4 +++- tests/backends/local/playback_test.py | 4 +++- tests/backends/local/playlists_test.py | 3 ++- tests/backends/local/tracklist_test.py | 4 +++- tests/backends/local/translator_test.py | 3 ++- tests/config/config_test.py | 12 ++++++++---- tests/config/schemas_test.py | 5 +++-- tests/config/types_test.py | 3 +-- tests/config/validator_tests.py | 4 ++-- tests/core/actor_test.py | 4 ++-- tests/core/events_test.py | 4 ++-- tests/core/library_test.py | 3 +-- tests/core/listener_test.py | 3 +-- tests/core/playback_test.py | 3 +-- tests/core/playlists_test.py | 3 +-- tests/core/tracklist_test.py | 3 +-- tests/exceptions_test.py | 4 ++-- tests/ext_test.py | 4 ++-- tests/frontends/http/events_test.py | 5 ++--- tests/frontends/mpd/dispatcher_test.py | 4 ++-- tests/frontends/mpd/exception_test.py | 4 ++-- tests/frontends/mpd/protocol/__init__.py | 4 ++-- tests/frontends/mpd/protocol/playback_test.py | 3 ++- tests/frontends/mpd/status_test.py | 4 ++-- tests/frontends/mpd/translator_test.py | 3 +-- tests/frontends/mpris/events_test.py | 3 +-- tests/frontends/mpris/player_interface_test.py | 4 ++-- tests/frontends/mpris/playlists_interface_test.py | 5 ++--- tests/frontends/mpris/root_interface_test.py | 4 ++-- tests/help_test.py | 3 +-- tests/models_test.py | 3 +-- tests/scanner_test.py | 4 +++- tests/utils/deps_test.py | 5 ++--- tests/utils/encoding_test.py | 3 +-- tests/utils/jsonrpc_test.py | 5 ++--- tests/utils/network/connection_test.py | 10 ++++++---- tests/utils/network/lineprotocol_test.py | 5 ++--- tests/utils/network/server_test.py | 8 +++++--- tests/utils/network/utils_test.py | 5 ++--- tests/utils/path_test.py | 6 ++++-- tests/version_test.py | 3 +-- 49 files changed, 104 insertions(+), 97 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index 60edf5ce..b358f32b 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import os import sys -import unittest # noqa def path_to_data_dir(name): diff --git a/tests/audio/actor_test.py b/tests/audio/actor_test.py index a40b0572..c311bdc3 100644 --- a/tests/audio/actor_test.py +++ b/tests/audio/actor_test.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals +import unittest + import pygst pygst.require('0.10') import gst @@ -9,7 +11,7 @@ import pykka from mopidy import audio from mopidy.utils.path import path_to_uri -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir class AudioTest(unittest.TestCase): diff --git a/tests/audio/listener_test.py b/tests/audio/listener_test.py index 2c6da8f4..08286cf9 100644 --- a/tests/audio/listener_test.py +++ b/tests/audio/listener_test.py @@ -1,11 +1,10 @@ from __future__ import unicode_literals import mock +import unittest from mopidy import audio -from tests import unittest - class AudioListenerTest(unittest.TestCase): def setUp(self): diff --git a/tests/backends/base/library.py b/tests/backends/base/library.py index 8390d2d6..4bc525c8 100644 --- a/tests/backends/base/library.py +++ b/tests/backends/base/library.py @@ -1,11 +1,13 @@ from __future__ import unicode_literals +import unittest + import pykka from mopidy import core from mopidy.models import Track, Album, Artist -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir class LibraryControllerTest(object): diff --git a/tests/backends/base/playback.py b/tests/backends/base/playback.py index 9ce73d31..44ae40f9 100644 --- a/tests/backends/base/playback.py +++ b/tests/backends/base/playback.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import mock import random import time +import unittest import pykka @@ -10,7 +11,6 @@ from mopidy import audio, core from mopidy.core import PlaybackState from mopidy.models import Track -from tests import unittest from tests.backends.base import populate_tracklist # TODO Test 'playlist repeat', e.g. repeat=1,single=0 diff --git a/tests/backends/base/playlists.py b/tests/backends/base/playlists.py index ad5648f9..139c21c6 100644 --- a/tests/backends/base/playlists.py +++ b/tests/backends/base/playlists.py @@ -1,12 +1,12 @@ from __future__ import unicode_literals +import unittest + import pykka from mopidy import audio, core from mopidy.models import Playlist -from tests import unittest - class PlaylistsControllerTest(object): config = {} diff --git a/tests/backends/listener_test.py b/tests/backends/listener_test.py index 4aee451e..ae2eb997 100644 --- a/tests/backends/listener_test.py +++ b/tests/backends/listener_test.py @@ -1,11 +1,10 @@ from __future__ import unicode_literals import mock +import unittest from mopidy.backends.listener import BackendListener -from tests import unittest - class BackendListenerTest(unittest.TestCase): def setUp(self): diff --git a/tests/backends/local/events_test.py b/tests/backends/local/events_test.py index 1218afc4..7b7ceadd 100644 --- a/tests/backends/local/events_test.py +++ b/tests/backends/local/events_test.py @@ -1,8 +1,10 @@ from __future__ import unicode_literals +import unittest + from mopidy.backends.local import actor -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir from tests.backends.base import events diff --git a/tests/backends/local/library_test.py b/tests/backends/local/library_test.py index 1cb933ce..c249a10e 100644 --- a/tests/backends/local/library_test.py +++ b/tests/backends/local/library_test.py @@ -1,8 +1,10 @@ from __future__ import unicode_literals +import unittest + from mopidy.backends.local import actor -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir from tests.backends.base.library import LibraryControllerTest diff --git a/tests/backends/local/playback_test.py b/tests/backends/local/playback_test.py index 7381113a..4c699699 100644 --- a/tests/backends/local/playback_test.py +++ b/tests/backends/local/playback_test.py @@ -1,11 +1,13 @@ from __future__ import unicode_literals +import unittest + from mopidy.backends.local import actor from mopidy.core import PlaybackState from mopidy.models import Track from mopidy.utils.path import path_to_uri -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir from tests.backends.base.playback import PlaybackControllerTest from tests.backends.local import generate_song diff --git a/tests/backends/local/playlists_test.py b/tests/backends/local/playlists_test.py index acaac941..2882e476 100644 --- a/tests/backends/local/playlists_test.py +++ b/tests/backends/local/playlists_test.py @@ -3,12 +3,13 @@ from __future__ import unicode_literals import os import shutil import tempfile +import unittest from mopidy.backends.local import actor from mopidy.models import Track from mopidy.utils.path import path_to_uri -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir from tests.backends.base.playlists import ( PlaylistsControllerTest) from tests.backends.local import generate_song diff --git a/tests/backends/local/tracklist_test.py b/tests/backends/local/tracklist_test.py index 44e4d004..c7650ac0 100644 --- a/tests/backends/local/tracklist_test.py +++ b/tests/backends/local/tracklist_test.py @@ -1,9 +1,11 @@ from __future__ import unicode_literals +import unittest + from mopidy.backends.local import actor from mopidy.models import Track -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir from tests.backends.base.tracklist import TracklistControllerTest from tests.backends.local import generate_song diff --git a/tests/backends/local/translator_test.py b/tests/backends/local/translator_test.py index 67907ff1..096d9a0d 100644 --- a/tests/backends/local/translator_test.py +++ b/tests/backends/local/translator_test.py @@ -4,12 +4,13 @@ from __future__ import unicode_literals import os import tempfile +import unittest from mopidy.backends.local.translator import parse_m3u, parse_mpd_tag_cache from mopidy.models import Track, Artist, Album from mopidy.utils.path import path_to_uri -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir data_dir = path_to_data_dir('') song1_path = path_to_data_dir('song1.mp3') diff --git a/tests/config/config_test.py b/tests/config/config_test.py index 1fbe07b0..a792839a 100644 --- a/tests/config/config_test.py +++ b/tests/config/config_test.py @@ -3,10 +3,11 @@ from __future__ import unicode_literals import mock +import unittest from mopidy import config -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir class LoadConfigTest(unittest.TestCase): @@ -111,9 +112,12 @@ class ParseOverrideTest(unittest.TestCase): def test_valid_override(self): expected = (b'section', b'key', b'value') self.assertEqual(expected, config.parse_override(b'section/key=value')) - self.assertEqual(expected, config.parse_override(b'section/key=value ')) - self.assertEqual(expected, config.parse_override(b'section/key =value')) - self.assertEqual(expected, config.parse_override(b'section /key=value')) + self.assertEqual( + expected, config.parse_override(b'section/key=value ')) + self.assertEqual( + expected, config.parse_override(b'section/key =value')) + self.assertEqual( + expected, config.parse_override(b'section /key=value')) def test_valid_override_is_bytes(self): section, key, value = config.parse_override(b'section/key=value') diff --git a/tests/config/schemas_test.py b/tests/config/schemas_test.py index 1595b508..8bcfc651 100644 --- a/tests/config/schemas_test.py +++ b/tests/config/schemas_test.py @@ -2,10 +2,11 @@ from __future__ import unicode_literals import logging import mock +import unittest -from mopidy.config import schemas, types +from mopidy.config import schemas -from tests import unittest, any_unicode +from tests import any_unicode class ConfigSchemaTest(unittest.TestCase): diff --git a/tests/config/types_test.py b/tests/config/types_test.py index eee32af1..24f1265e 100644 --- a/tests/config/types_test.py +++ b/tests/config/types_test.py @@ -6,11 +6,10 @@ import logging import mock import socket import sys +import unittest from mopidy.config import types -from tests import unittest - # TODO: DecodeTest and EncodeTest diff --git a/tests/config/validator_tests.py b/tests/config/validator_tests.py index 63ef8ca6..ce773340 100644 --- a/tests/config/validator_tests.py +++ b/tests/config/validator_tests.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals -from mopidy.config import validators +import unittest -from tests import unittest +from mopidy.config import validators class ValidateChoiceTest(unittest.TestCase): diff --git a/tests/core/actor_test.py b/tests/core/actor_test.py index d86b8702..c4952af3 100644 --- a/tests/core/actor_test.py +++ b/tests/core/actor_test.py @@ -1,12 +1,12 @@ from __future__ import unicode_literals import mock +import unittest + import pykka from mopidy.core import Core -from tests import unittest - class CoreActorTest(unittest.TestCase): def setUp(self): diff --git a/tests/core/events_test.py b/tests/core/events_test.py index 7f673b02..6d192b87 100644 --- a/tests/core/events_test.py +++ b/tests/core/events_test.py @@ -1,14 +1,14 @@ from __future__ import unicode_literals import mock +import unittest + import pykka from mopidy import core from mopidy.backends import dummy from mopidy.models import Track -from tests import unittest - @mock.patch.object(core.CoreListener, 'send') class BackendEventsTest(unittest.TestCase): diff --git a/tests/core/library_test.py b/tests/core/library_test.py index 6e9d240a..f4028d2f 100644 --- a/tests/core/library_test.py +++ b/tests/core/library_test.py @@ -1,13 +1,12 @@ from __future__ import unicode_literals import mock +import unittest from mopidy.backends import base from mopidy.core import Core from mopidy.models import SearchResult, Track -from tests import unittest - class CoreLibraryTest(unittest.TestCase): def setUp(self): diff --git a/tests/core/listener_test.py b/tests/core/listener_test.py index 2d7182d9..bf3a235d 100644 --- a/tests/core/listener_test.py +++ b/tests/core/listener_test.py @@ -1,12 +1,11 @@ from __future__ import unicode_literals import mock +import unittest from mopidy.core import CoreListener, PlaybackState from mopidy.models import Playlist, TlTrack -from tests import unittest - class CoreListenerTest(unittest.TestCase): def setUp(self): diff --git a/tests/core/playback_test.py b/tests/core/playback_test.py index ffbca506..74f8a105 100644 --- a/tests/core/playback_test.py +++ b/tests/core/playback_test.py @@ -1,13 +1,12 @@ from __future__ import unicode_literals import mock +import unittest from mopidy.backends import base from mopidy.core import Core, PlaybackState from mopidy.models import Track -from tests import unittest - class CorePlaybackTest(unittest.TestCase): def setUp(self): diff --git a/tests/core/playlists_test.py b/tests/core/playlists_test.py index f11e1776..01c2b881 100644 --- a/tests/core/playlists_test.py +++ b/tests/core/playlists_test.py @@ -1,13 +1,12 @@ from __future__ import unicode_literals import mock +import unittest from mopidy.backends import base from mopidy.core import Core from mopidy.models import Playlist, Track -from tests import unittest - class PlaylistsTest(unittest.TestCase): def setUp(self): diff --git a/tests/core/tracklist_test.py b/tests/core/tracklist_test.py index 93d914ed..9f17f6de 100644 --- a/tests/core/tracklist_test.py +++ b/tests/core/tracklist_test.py @@ -1,13 +1,12 @@ from __future__ import unicode_literals import mock +import unittest from mopidy.backends import base from mopidy.core import Core from mopidy.models import Track -from tests import unittest - class TracklistTest(unittest.TestCase): def setUp(self): diff --git a/tests/exceptions_test.py b/tests/exceptions_test.py index 5c244872..da8fed90 100644 --- a/tests/exceptions_test.py +++ b/tests/exceptions_test.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals -from mopidy import exceptions +import unittest -from tests import unittest +from mopidy import exceptions class ExceptionsTest(unittest.TestCase): diff --git a/tests/ext_test.py b/tests/ext_test.py index 7bbe5cc4..f6b0ccfe 100644 --- a/tests/ext_test.py +++ b/tests/ext_test.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals -from mopidy import config, ext +import unittest -from tests import unittest +from mopidy import config, ext class ExtensionTest(unittest.TestCase): diff --git a/tests/frontends/http/events_test.py b/tests/frontends/http/events_test.py index ee08a60a..2c6b241e 100644 --- a/tests/frontends/http/events_test.py +++ b/tests/frontends/http/events_test.py @@ -1,6 +1,8 @@ from __future__ import unicode_literals import json +import mock +import unittest try: import cherrypy @@ -15,9 +17,6 @@ except ImportError: if cherrypy and ws4py: from mopidy.frontends.http import actor -import mock -from tests import unittest - @unittest.skipUnless(cherrypy, 'cherrypy not found') @unittest.skipUnless(ws4py, 'ws4py not found') diff --git a/tests/frontends/mpd/dispatcher_test.py b/tests/frontends/mpd/dispatcher_test.py index 35e18c3b..9ef88e44 100644 --- a/tests/frontends/mpd/dispatcher_test.py +++ b/tests/frontends/mpd/dispatcher_test.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals +import unittest + import pykka from mopidy import core @@ -8,8 +10,6 @@ from mopidy.frontends.mpd.dispatcher import MpdDispatcher from mopidy.frontends.mpd.exceptions import MpdAckError from mopidy.frontends.mpd.protocol import request_handlers, handle_request -from tests import unittest - class MpdDispatcherTest(unittest.TestCase): def setUp(self): diff --git a/tests/frontends/mpd/exception_test.py b/tests/frontends/mpd/exception_test.py index fe834673..3b42f1b9 100644 --- a/tests/frontends/mpd/exception_test.py +++ b/tests/frontends/mpd/exception_test.py @@ -1,11 +1,11 @@ from __future__ import unicode_literals +import unittest + from mopidy.frontends.mpd.exceptions import ( MpdAckError, MpdPermissionError, MpdUnknownCommand, MpdSystemError, MpdNotImplemented) -from tests import unittest - class MpdExceptionsTest(unittest.TestCase): def test_key_error_wrapped_in_mpd_ack_error(self): diff --git a/tests/frontends/mpd/protocol/__init__.py b/tests/frontends/mpd/protocol/__init__.py index 21ba1c25..aa9a5a6d 100644 --- a/tests/frontends/mpd/protocol/__init__.py +++ b/tests/frontends/mpd/protocol/__init__.py @@ -1,14 +1,14 @@ from __future__ import unicode_literals import mock +import unittest + import pykka from mopidy import core from mopidy.backends import dummy from mopidy.frontends.mpd import session -from tests import unittest - class MockConnection(mock.Mock): def __init__(self, *args, **kwargs): diff --git a/tests/frontends/mpd/protocol/playback_test.py b/tests/frontends/mpd/protocol/playback_test.py index cc49a8cd..2cfc1b98 100644 --- a/tests/frontends/mpd/protocol/playback_test.py +++ b/tests/frontends/mpd/protocol/playback_test.py @@ -1,9 +1,10 @@ from __future__ import unicode_literals +import unittest + from mopidy.core import PlaybackState from mopidy.models import Track -from tests import unittest from tests.frontends.mpd import protocol diff --git a/tests/frontends/mpd/status_test.py b/tests/frontends/mpd/status_test.py index 8868eef7..ded0c3b2 100644 --- a/tests/frontends/mpd/status_test.py +++ b/tests/frontends/mpd/status_test.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals +import unittest + import pykka from mopidy import core @@ -9,8 +11,6 @@ from mopidy.frontends.mpd import dispatcher from mopidy.frontends.mpd.protocol import status from mopidy.models import Track -from tests import unittest - PAUSED = PlaybackState.PAUSED PLAYING = PlaybackState.PLAYING diff --git a/tests/frontends/mpd/translator_test.py b/tests/frontends/mpd/translator_test.py index e4755d01..860e01e9 100644 --- a/tests/frontends/mpd/translator_test.py +++ b/tests/frontends/mpd/translator_test.py @@ -2,13 +2,12 @@ from __future__ import unicode_literals import datetime import os +import unittest from mopidy.utils.path import mtime, uri_to_path from mopidy.frontends.mpd import translator, protocol from mopidy.models import Album, Artist, TlTrack, Playlist, Track -from tests import unittest - class TrackMpdFormatTest(unittest.TestCase): track = Track( diff --git a/tests/frontends/mpris/events_test.py b/tests/frontends/mpris/events_test.py index b336cbc7..0a4bc79f 100644 --- a/tests/frontends/mpris/events_test.py +++ b/tests/frontends/mpris/events_test.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals import mock +import unittest try: import dbus @@ -12,8 +13,6 @@ from mopidy.models import Playlist, TlTrack if dbus: from mopidy.frontends.mpris import actor, objects -from tests import unittest - @unittest.skipUnless(dbus, 'dbus not found') class BackendEventsTest(unittest.TestCase): diff --git a/tests/frontends/mpris/player_interface_test.py b/tests/frontends/mpris/player_interface_test.py index 2353d831..52cd964b 100644 --- a/tests/frontends/mpris/player_interface_test.py +++ b/tests/frontends/mpris/player_interface_test.py @@ -1,6 +1,8 @@ from __future__ import unicode_literals import mock +import unittest + import pykka try: @@ -16,8 +18,6 @@ from mopidy.models import Album, Artist, Track if dbus: from mopidy.frontends.mpris import objects -from tests import unittest - PLAYING = PlaybackState.PLAYING PAUSED = PlaybackState.PAUSED STOPPED = PlaybackState.STOPPED diff --git a/tests/frontends/mpris/playlists_interface_test.py b/tests/frontends/mpris/playlists_interface_test.py index 06f7f45e..f8e2cf3e 100644 --- a/tests/frontends/mpris/playlists_interface_test.py +++ b/tests/frontends/mpris/playlists_interface_test.py @@ -1,8 +1,9 @@ from __future__ import unicode_literals import datetime - import mock +import unittest + import pykka try: @@ -18,8 +19,6 @@ from mopidy.models import Track if dbus: from mopidy.frontends.mpris import objects -from tests import unittest - @unittest.skipUnless(dbus, 'dbus not found') class PlayerInterfaceTest(unittest.TestCase): diff --git a/tests/frontends/mpris/root_interface_test.py b/tests/frontends/mpris/root_interface_test.py index 85c72c97..f95f0969 100644 --- a/tests/frontends/mpris/root_interface_test.py +++ b/tests/frontends/mpris/root_interface_test.py @@ -1,6 +1,8 @@ from __future__ import unicode_literals import mock +import unittest + import pykka try: @@ -14,8 +16,6 @@ from mopidy.backends import dummy if dbus: from mopidy.frontends.mpris import objects -from tests import unittest - @unittest.skipUnless(dbus, 'dbus not found') class RootInterfaceTest(unittest.TestCase): diff --git a/tests/help_test.py b/tests/help_test.py index b1ba9d64..4f210031 100644 --- a/tests/help_test.py +++ b/tests/help_test.py @@ -3,11 +3,10 @@ from __future__ import unicode_literals import os import subprocess import sys +import unittest import mopidy -from tests import unittest - class HelpTest(unittest.TestCase): def test_help_has_mopidy_options(self): diff --git a/tests/models_test.py b/tests/models_test.py index c2d65ec6..a0fe08c7 100644 --- a/tests/models_test.py +++ b/tests/models_test.py @@ -2,13 +2,12 @@ from __future__ import unicode_literals import datetime import json +import unittest from mopidy.models import ( Artist, Album, TlTrack, Track, Playlist, SearchResult, ModelJSONEncoder, model_json_decoder) -from tests import unittest - class GenericCopyTest(unittest.TestCase): def compare(self, orig, other): diff --git a/tests/scanner_test.py b/tests/scanner_test.py index edcc2242..63383806 100644 --- a/tests/scanner_test.py +++ b/tests/scanner_test.py @@ -1,9 +1,11 @@ from __future__ import unicode_literals +import unittest + from mopidy.scanner import Scanner, translator from mopidy.models import Track, Artist, Album -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir class FakeGstDate(object): diff --git a/tests/utils/deps_test.py b/tests/utils/deps_test.py index 017fe27a..4ad04ed7 100644 --- a/tests/utils/deps_test.py +++ b/tests/utils/deps_test.py @@ -1,18 +1,17 @@ from __future__ import unicode_literals import platform +import mock +import unittest import pygst pygst.require('0.10') import gst -import mock import pkg_resources from mopidy.utils import deps -from tests import unittest - class DepsTest(unittest.TestCase): def test_format_dependency_list(self): diff --git a/tests/utils/encoding_test.py b/tests/utils/encoding_test.py index b7292de0..88ad5899 100644 --- a/tests/utils/encoding_test.py +++ b/tests/utils/encoding_test.py @@ -1,11 +1,10 @@ from __future__ import unicode_literals import mock +import unittest from mopidy.utils.encoding import locale_decode -from tests import unittest - @mock.patch('mopidy.utils.encoding.locale.getpreferredencoding') class LocaleDecodeTest(unittest.TestCase): diff --git a/tests/utils/jsonrpc_test.py b/tests/utils/jsonrpc_test.py index 7fb8a55e..f60bdccd 100644 --- a/tests/utils/jsonrpc_test.py +++ b/tests/utils/jsonrpc_test.py @@ -1,16 +1,15 @@ from __future__ import unicode_literals import json +import mock +import unittest import pykka -import mock from mopidy import core, models from mopidy.backends import dummy from mopidy.utils import jsonrpc -from tests import unittest - class Calculator(object): def model(self): diff --git a/tests/utils/network/connection_test.py b/tests/utils/network/connection_test.py index 3e63cdfc..c0a74542 100644 --- a/tests/utils/network/connection_test.py +++ b/tests/utils/network/connection_test.py @@ -1,15 +1,17 @@ from __future__ import unicode_literals import errno -import gobject import logging -import pykka -import socket from mock import patch, sentinel, Mock +import socket +import unittest + +import gobject +import pykka from mopidy.utils import network -from tests import unittest, any_int, any_unicode +from tests import any_int, any_unicode class ConnectionTest(unittest.TestCase): diff --git a/tests/utils/network/lineprotocol_test.py b/tests/utils/network/lineprotocol_test.py index 530c708c..4919754d 100644 --- a/tests/utils/network/lineprotocol_test.py +++ b/tests/utils/network/lineprotocol_test.py @@ -2,13 +2,12 @@ from __future__ import unicode_literals -import re from mock import sentinel, Mock +import re +import unittest from mopidy.utils import network -from tests import unittest - class LineProtocolTest(unittest.TestCase): def setUp(self): diff --git a/tests/utils/network/server_test.py b/tests/utils/network/server_test.py index 3f7da337..123f535c 100644 --- a/tests/utils/network/server_test.py +++ b/tests/utils/network/server_test.py @@ -1,13 +1,15 @@ from __future__ import unicode_literals import errno -import gobject -import socket from mock import patch, sentinel, Mock +import socket +import unittest + +import gobject from mopidy.utils import network -from tests import unittest, any_int +from tests import any_int class ServerTest(unittest.TestCase): diff --git a/tests/utils/network/utils_test.py b/tests/utils/network/utils_test.py index ff8af9bd..527e9196 100644 --- a/tests/utils/network/utils_test.py +++ b/tests/utils/network/utils_test.py @@ -1,12 +1,11 @@ from __future__ import unicode_literals -import socket from mock import patch, Mock +import socket +import unittest from mopidy.utils import network -from tests import unittest - class FormatHostnameTest(unittest.TestCase): @patch('mopidy.utils.network.has_ipv6', True) diff --git a/tests/utils/path_test.py b/tests/utils/path_test.py index f7306f3d..54a9a8a4 100644 --- a/tests/utils/path_test.py +++ b/tests/utils/path_test.py @@ -2,15 +2,17 @@ from __future__ import unicode_literals -import glib import os import shutil import sys import tempfile +import unittest + +import glib from mopidy.utils import path -from tests import unittest, path_to_data_dir +from tests import path_to_data_dir class GetOrCreateDirTest(unittest.TestCase): diff --git a/tests/version_test.py b/tests/version_test.py index ce16d435..10c35c8f 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -1,11 +1,10 @@ from __future__ import unicode_literals from distutils.version import StrictVersion as SV +import unittest from mopidy import __version__ -from tests import unittest - class VersionTest(unittest.TestCase): def test_current_version_is_parsable_as_a_strict_version_number(self):