diff --git a/tests/__init__.py b/tests/__init__.py index e69de29b..fd6a6508 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1,8 @@ +try: # 2.7 + from unittest.case import SkipTest +except ImportError: + try: # Nose + from nose.plugins.skip import SkipTest + except ImportError: # Failsafe + class SkipTest(Exception): + pass diff --git a/tests/backends/base.py b/tests/backends/base.py index 81b89bb4..625e29d8 100644 --- a/tests/backends/base.py +++ b/tests/backends/base.py @@ -1,11 +1,11 @@ import random import time -from nose.plugins.skip import SkipTest - from mopidy.mixers.dummy import DummyMixer from mopidy.models import Playlist, Track +from tests import SkipTest + def populate_playlist(func): def wrapper(self): for track in self.tracks: diff --git a/tests/mpd/frontend_test.py b/tests/mpd/frontend_test.py index 4fb829ba..3f8a35ce 100644 --- a/tests/mpd/frontend_test.py +++ b/tests/mpd/frontend_test.py @@ -6,6 +6,8 @@ from mopidy.mixers.dummy import DummyMixer from mopidy.models import Track, Playlist from mopidy.mpd import frontend +from tests import SkipTest + class RequestHandlerTest(unittest.TestCase): def setUp(self): self.m = DummyMixer()