andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a bunch of pylint errors/warnings in test suite

Browse Source
This commit is contained in:
Stein Magnus Jodal 2011-01-23 18:39:05 +01:00
parent a8c43d057f
commit c097af1a83
10 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/__init__.py
View File

@ -1,7 +1,9 @@
import os
try: # 2.7
# pylint: disable = E0611,F0401
from unittest.case import SkipTest
# pylint: enable = E0611,F0401
except ImportError:
try: # Nose
from nose.plugins.skip import SkipTest

2
tests/backends/base/current_playlist.py
View File

@ -1,11 +1,9 @@
import multiprocessing
import random
from mopidy import settings
from mopidy.mixers.dummy import DummyMixer
from mopidy.models import Playlist, Track
from mopidy.outputs.dummy import DummyOutput
from mopidy.utils import get_class
from tests.backends.base import populate_playlist

35
tests/backends/base/playback.py
View File

@ -2,11 +2,9 @@ import multiprocessing
import random
import time
from mopidy import settings
from mopidy.mixers.dummy import DummyMixer
from mopidy.models import Track
from mopidy.outputs.dummy import DummyOutput
from mopidy.utils import get_class
from tests import SkipTest
from tests.backends.base import populate_playlist
@ -212,7 +210,7 @@ class PlaybackControllerTest(object):
def test_next_until_end_of_playlist_and_play_from_start(self):
self.playback.play()
for track in self.tracks:
for _ in self.tracks:
self.playback.next()
self.assertEqual(self.playback.current_track, None)
@ -258,7 +256,7 @@ class PlaybackControllerTest(object):
@populate_playlist
def test_next_track_at_end_of_playlist(self):
self.playback.play()
for track in self.current_playlist.cp_tracks[1:]:
for _ in self.current_playlist.cp_tracks[1:]:
self.playback.next()
self.assertEqual(self.playback.track_at_next, None)
@ -266,7 +264,7 @@ class PlaybackControllerTest(object):
def test_next_track_at_end_of_playlist_with_repeat(self):
self.playback.repeat = True
self.playback.play()
for track in self.tracks[1:]:
for _ in self.tracks[1:]:
self.playback.next()
self.assertEqual(self.playback.track_at_next, self.tracks[0])
@ -348,7 +346,7 @@ class PlaybackControllerTest(object):
def test_end_of_track_until_end_of_playlist_and_play_from_start(self):
self.playback.play()
for track in self.tracks:
for _ in self.tracks:
self.playback.on_end_of_track()
self.assertEqual(self.playback.current_track, None)
@ -394,7 +392,7 @@ class PlaybackControllerTest(object):
@populate_playlist
def test_end_of_track_track_at_end_of_playlist(self):
self.playback.play()
for track in self.current_playlist.cp_tracks[1:]:
for _ in self.current_playlist.cp_tracks[1:]:
self.playback.on_end_of_track()
self.assertEqual(self.playback.track_at_next, None)
@ -402,7 +400,7 @@ class PlaybackControllerTest(object):
def test_end_of_track_track_at_end_of_playlist_with_repeat(self):
self.playback.repeat = True
self.playback.play()
for track in self.tracks[1:]:
for _ in self.tracks[1:]:
self.playback.on_end_of_track()
self.assertEqual(self.playback.track_at_next, self.tracks[0])
@ -466,7 +464,7 @@ class PlaybackControllerTest(object):
@populate_playlist
def test_previous_track_with_consume(self):
self.playback.consume = True
for track in self.tracks:
for _ in self.tracks:
self.playback.next()
self.assertEqual(self.playback.track_at_previous,
self.playback.current_track)
@ -474,7 +472,7 @@ class PlaybackControllerTest(object):
@populate_playlist
def test_previous_track_with_random(self):
self.playback.random = True
for track in self.tracks:
for _ in self.tracks:
self.playback.next()
self.assertEqual(self.playback.track_at_previous,
self.playback.current_track)
@ -547,7 +545,6 @@ class PlaybackControllerTest(object):
@populate_playlist
def test_on_current_playlist_change_when_stopped(self):
current_track = self.playback.current_track
self.backend.current_playlist.append([self.tracks[2]])
self.assertEqual(self.playback.state, self.playback.STOPPED)
self.assertEqual(self.playback.current_track, None)
@ -677,9 +674,10 @@ class PlaybackControllerTest(object):
self.playback.seek(0)
self.assertEqual(self.playback.state, self.playback.PLAYING)
@SkipTest
@populate_playlist
def test_seek_beyond_end_of_song(self):
raise SkipTest # FIXME need to decide return value
# FIXME need to decide return value
self.playback.play()
result = self.playback.seek(self.tracks[0].length*100)
self.assert_(not result, 'Seek return value was %s' % result)
@ -696,9 +694,10 @@ class PlaybackControllerTest(object):
self.playback.seek(self.current_playlist.tracks[-1].length * 100)
self.assertEqual(self.playback.state, self.playback.STOPPED)
@SkipTest
@populate_playlist
def test_seek_beyond_start_of_song(self):
raise SkipTest # FIXME need to decide return value
# FIXME need to decide return value
self.playback.play()
result = self.playback.seek(-1000)
self.assert_(not result, 'Seek return value was %s' % result)
@ -770,7 +769,7 @@ class PlaybackControllerTest(object):
def test_playlist_is_empty_after_all_tracks_are_played_with_consume(self):
self.playback.consume = True
self.playback.play()
for i in range(len(self.backend.current_playlist.tracks)):
for _ in range(len(self.backend.current_playlist.tracks)):
self.playback.on_end_of_track()
self.assertEqual(len(self.backend.current_playlist.tracks), 0)
@ -824,14 +823,14 @@ class PlaybackControllerTest(object):
def test_random_until_end_of_playlist(self):
self.playback.random = True
self.playback.play()
for track in self.tracks[1:]:
for _ in self.tracks[1:]:
self.playback.next()
self.assertEqual(self.playback.track_at_next, None)
@populate_playlist
def test_random_until_end_of_playlist_and_play_from_start(self):
self.playback.repeat = True
for track in self.tracks:
for _ in self.tracks:
self.playback.next()
self.assertNotEqual(self.playback.track_at_next, None)
self.assertEqual(self.playback.state, self.playback.STOPPED)
@ -843,7 +842,7 @@ class PlaybackControllerTest(object):
self.playback.repeat = True
self.playback.random = True
self.playback.play()
for track in self.tracks:
for _ in self.tracks:
self.playback.next()
self.assertNotEqual(self.playback.track_at_next, None)
@ -852,7 +851,7 @@ class PlaybackControllerTest(object):
self.playback.random = True
self.playback.play()
played = []
for track in self.tracks:
for _ in self.tracks:
self.assert_(self.playback.current_track not in played)
played.append(self.playback.current_track)
self.playback.next()

2
tests/frontends/mpd/playback_test.py
View File

@ -323,6 +323,7 @@ class PlaybackControlHandlerTest(unittest.TestCase):
self.b.current_playlist.append(
[Track(uri='1', length=40000), seek_track])
result = self.h.handle_request(u'seek "1" "30"')
self.assert_(u'OK' in result)
self.assertEqual(self.b.playback.current_track, seek_track)
def test_seek_without_quotes(self):
@ -343,6 +344,7 @@ class PlaybackControlHandlerTest(unittest.TestCase):
self.b.current_playlist.append(
[Track(length=40000), seek_track])
result = self.h.handle_request(u'seekid "1" "30"')
self.assert_(u'OK' in result)
self.assertEqual(self.b.playback.current_cpid, 1)
self.assertEqual(self.b.playback.current_track, seek_track)

6
tests/frontends/mpd/serializer_test.py
View File

@ -7,8 +7,6 @@ from mopidy.utils.path import mtime, uri_to_path
from mopidy.frontends.mpd import translator, protocol
from mopidy.models import Album, Artist, Playlist, Track
from tests import data_folder, SkipTest
class TrackMpdFormatTest(unittest.TestCase):
track = Track(
uri=u'a uri',
@ -54,7 +52,8 @@ class TrackMpdFormatTest(unittest.TestCase):
self.assert_(('Id', 2) in result)
def test_track_to_mpd_format_for_nonempty_track(self):
result = translator.track_to_mpd_format(self.track, position=9, cpid=122)
result = translator.track_to_mpd_format(
self.track, position=9, cpid=122)
self.assert_(('file', 'a uri') in result)
self.assert_(('Time', 137) in result)
self.assert_(('Artist', 'an artist') in result)
@ -219,7 +218,6 @@ class TracksToTagCacheFormatTest(unittest.TestCase):
def test_tag_cache_diretory_header_is_right(self):
track = Track(uri='file:///dir/subdir/folder/sub/song.mp3')
formated = self.translate(track)
result = translator.tracks_to_tag_cache_format([track])
result = self.consume_headers(result)

2
tests/mixers/base_test.py
View File

@ -10,7 +10,9 @@ class BaseMixerTest(object):
def setUp(self):
assert self.mixer_class is not None, \
"mixer_class must be set in subclass"
# pylint: disable = E1102
self.mixer = self.mixer_class(None)
# pylint: enable = E1102
def test_initial_volume(self):
self.assertEqual(self.mixer.volume, self.INITIAL)

6
tests/models_test.py
View File

@ -205,8 +205,10 @@ class AlbumTest(unittest.TestCase):
def test_eq(self):
artists = [Artist()]
album1 = Album(name=u'name', uri=u'uri', artists=artists, num_tracks=2, musicbrainz_id='id')
album2 = Album(name=u'name', uri=u'uri', artists=artists, num_tracks=2, musicbrainz_id='id')
album1 = Album(name=u'name', uri=u'uri', artists=artists, num_tracks=2,
musicbrainz_id='id')
album2 = Album(name=u'name', uri=u'uri', artists=artists, num_tracks=2,
musicbrainz_id='id')
self.assertEqual(album1, album2)
self.assertEqual(hash(album1), hash(album2))

1
tests/outputs/gstreamer_test.py
View File

@ -11,7 +11,6 @@ if sys.platform == 'win32':
from mopidy import settings
from mopidy.outputs.gstreamer import GStreamerOutput
from mopidy.utils.path import path_to_uri
from mopidy.utils.process import pickle_connection
from tests import data_folder

2
tests/utils/path_test.py
View File

@ -9,7 +9,7 @@ import unittest
from mopidy.utils.path import (get_or_create_folder, mtime,
path_to_uri, uri_to_path, split_path, find_files)
from tests import SkipTest, data_folder
from tests import data_folder
class GetOrCreateFolderTest(unittest.TestCase):
def setUp(self):

4
tests/utils/settings_test.py
View File

@ -57,7 +57,7 @@ class SettingsProxyTest(unittest.TestCase):
def test_getattr_raises_error_on_missing_setting(self):
try:
test = self.settings.TEST
_ = self.settings.TEST
self.fail(u'Should raise exception')
except SettingsError as e:
self.assertEqual(u'Setting "TEST" is not set.', e.message)
@ -65,7 +65,7 @@ class SettingsProxyTest(unittest.TestCase):
def test_getattr_raises_error_on_empty_setting(self):
self.settings.TEST = u''
try:
test = self.settings.TEST
_ = self.settings.TEST
self.fail(u'Should raise exception')
except SettingsError as e:
self.assertEqual(u'Setting "TEST" is empty.', e.message)