tests: Import unittest directly from the stdlib

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):

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):

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):

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):

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

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 = {}

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):

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
 
 

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
 
 

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
 

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

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
 

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')

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(
-        self.assertEqual(expected, config.parse_override(b'section/key =value'))
+            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')

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):

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
 
 

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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')

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):

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):

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):

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
 
 

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

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(

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):

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

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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)

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):

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):