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

Make tests check that response only has values once, fixes double OK bug

Browse Source
This commit is contained in:
Thomas Adamcik 2011-07-23 03:58:26 +02:00
parent 63dba5553f
commit 0e58d771cd
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy/frontends/mpd/protocol/status.py
View File

@ -91,8 +91,6 @@ def idle(context, subsystems=None):
for subsystem in active: for subsystem in active:
response.append(u'changed: %s' % subsystem) response.append(u'changed: %s' % subsystem)
response.append(u'OK')
return response return response
@handle_request(r'^noidle$') @handle_request(r'^noidle$')

5
tests/frontends/mpd/protocol/__init__.py
View File

@ -46,6 +46,11 @@ class BaseTestCase(unittest.TestCase):
self.assert_(value in self.connection.response, u'Did not find %s ' self.assert_(value in self.connection.response, u'Did not find %s '
'in %s' % (repr(value), repr(self.connection.response))) 'in %s' % (repr(value), repr(self.connection.response)))
def assertOnceInResponse(self, value):
matched = len([r for r in self.connection.response if r == value])
self.assertEqual(1, matched, 'Expected to find %s once in %s' %
(repr(value), repr(self.connection.response)))
def assertNotInResponse(self, value): def assertNotInResponse(self, value):
self.assert_(value not in self.connection.response, u'Found %s in %s' % self.assert_(value not in self.connection.response, u'Found %s in %s' %
(repr(value), repr(self.connection.response))) (repr(value), repr(self.connection.response)))

42
tests/frontends/mpd/protocol/idle_test.py
View File

@ -63,7 +63,7 @@ class IdleHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'noidle') self.sendRequest(u'noidle')
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertNoEvents() self.assertNoEvents()
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_idle_then_noidle_enables_timeout(self): def test_idle_then_noidle_enables_timeout(self):
self.sendRequest(u'idle') self.sendRequest(u'idle')
@ -93,39 +93,39 @@ class IdleHandlerTest(protocol.BaseTestCase):
self.idleEvent(u'player') self.idleEvent(u'player')
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertNoEvents() self.assertNoEvents()
self.assertInResponse(u'changed: player') self.assertOnceInResponse(u'changed: player')
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_idle_player_then_event_player(self): def test_idle_player_then_event_player(self):
self.sendRequest(u'idle player') self.sendRequest(u'idle player')
self.idleEvent(u'player') self.idleEvent(u'player')
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertNoEvents() self.assertNoEvents()
self.assertInResponse(u'changed: player') self.assertOnceInResponse(u'changed: player')
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_idle_player_then_noidle(self): def test_idle_player_then_noidle(self):
self.sendRequest(u'idle player') self.sendRequest(u'idle player')
self.sendRequest(u'noidle') self.sendRequest(u'noidle')
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertNoEvents() self.assertNoEvents()
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_idle_player_playlist_then_noidle(self): def test_idle_player_playlist_then_noidle(self):
self.sendRequest(u'idle player playlist') self.sendRequest(u'idle player playlist')
self.sendRequest(u'noidle') self.sendRequest(u'noidle')
self.assertNoEvents() self.assertNoEvents()
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_idle_player_playlist_then_player(self): def test_idle_player_playlist_then_player(self):
self.sendRequest(u'idle player playlist') self.sendRequest(u'idle player playlist')
self.idleEvent(u'player') self.idleEvent(u'player')
self.assertNoEvents() self.assertNoEvents()
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertInResponse(u'changed: player') self.assertOnceInResponse(u'changed: player')
self.assertNotInResponse(u'changed: playlist') self.assertNotInResponse(u'changed: playlist')
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_idle_playlist_then_player(self): def test_idle_playlist_then_player(self):
self.sendRequest(u'idle playlist') self.sendRequest(u'idle playlist')
@ -141,8 +141,8 @@ class IdleHandlerTest(protocol.BaseTestCase):
self.assertNoEvents() self.assertNoEvents()
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertNotInResponse(u'changed: player') self.assertNotInResponse(u'changed: player')
self.assertInResponse(u'changed: playlist') self.assertOnceInResponse(u'changed: playlist')
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_player(self): def test_player(self):
self.idleEvent(u'player') self.idleEvent(u'player')
@ -155,9 +155,9 @@ class IdleHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'idle player') self.sendRequest(u'idle player')
self.assertNoEvents() self.assertNoEvents()
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertInResponse(u'changed: player') self.assertOnceInResponse(u'changed: player')
self.assertNotInResponse(u'changed: playlist') self.assertNotInResponse(u'changed: playlist')
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_player_then_playlist(self): def test_player_then_playlist(self):
self.idleEvent(u'player') self.idleEvent(u'player')
@ -171,8 +171,8 @@ class IdleHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'idle') self.sendRequest(u'idle')
self.assertNoEvents() self.assertNoEvents()
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertInResponse(u'changed: player') self.assertOnceInResponse(u'changed: player')
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_player_then_playlist_then_idle(self): def test_player_then_playlist_then_idle(self):
self.idleEvent(u'player') self.idleEvent(u'player')
@ -180,9 +180,9 @@ class IdleHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'idle') self.sendRequest(u'idle')
self.assertNoEvents() self.assertNoEvents()
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertInResponse(u'changed: player') self.assertOnceInResponse(u'changed: player')
self.assertInResponse(u'changed: playlist') self.assertOnceInResponse(u'changed: playlist')
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_player_then_idle_playlist(self): def test_player_then_idle_playlist(self):
self.idleEvent(u'player') self.idleEvent(u'player')
@ -197,7 +197,7 @@ class IdleHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'noidle') self.sendRequest(u'noidle')
self.assertNoEvents() self.assertNoEvents()
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')
def test_player_then_playlist_then_idle_playlist(self): def test_player_then_playlist_then_idle_playlist(self):
self.idleEvent(u'player') self.idleEvent(u'player')
@ -206,5 +206,5 @@ class IdleHandlerTest(protocol.BaseTestCase):
self.assertNoEvents() self.assertNoEvents()
self.assertNoSubscriptions() self.assertNoSubscriptions()
self.assertNotInResponse(u'changed: player') self.assertNotInResponse(u'changed: player')
self.assertInResponse(u'changed: playlist') self.assertOnceInResponse(u'changed: playlist')
self.assertInResponse(u'OK') self.assertOnceInResponse(u'OK')