From 95046b4852f6630df6a98f415fc0a3f15171ebb3 Mon Sep 17 00:00:00 2001
From: Lasse Bigum <lasse@bigum.org>
Date: Tue, 22 Oct 2013 00:12:32 +0200
Subject: [PATCH] Fix small bug and fix test

---
 mopidy/frontends/mpd/translator.py            |  2 +-
 tests/frontends/mpd/protocol/music_db_test.py | 24 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/mopidy/frontends/mpd/translator.py b/mopidy/frontends/mpd/translator.py
index ec6dec4b..80bfb60a 100644
--- a/mopidy/frontends/mpd/translator.py
+++ b/mopidy/frontends/mpd/translator.py
@@ -202,7 +202,7 @@ def query_from_mpd_search_format(mpd_query):
         field = m.groupdict()['field'].lower()
         if field == 'title':
             field = 'track'
-        if field == 'track':
+        elif field == 'track':
             field = 'track_no'
         elif field in ('file', 'filename'):
             field = 'uri'
diff --git a/tests/frontends/mpd/protocol/music_db_test.py b/tests/frontends/mpd/protocol/music_db_test.py
index 203fc020..0d4dcaac 100644
--- a/tests/frontends/mpd/protocol/music_db_test.py
+++ b/tests/frontends/mpd/protocol/music_db_test.py
@@ -25,20 +25,24 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase):
         self.assertInResponse('OK')
 
     def test_count_correct_length(self):
-        self.backend.library.dummy_search_result = SearchResult(
-            tracks=[Track(name='A', date="2001", length=4000),
-                    Track(name='B', date="2001", length=50000),
-                    Track(name='C', date="2001", length=600000),
-                    Track(name='D', date="2009", length=60000)
-                    ])
-        self.sendRequest('count "date" "2009"')
+        # Count the lone track
+        self.backend.library.dummy_find_exact_result = SearchResult(
+            tracks=[Track(uri='dummy:a', name="foo", date="2001", length=4000)]
+            )
+        self.sendRequest('count "title" "foo"')
         self.assertInResponse('songs: 1')
-        self.assertInResponse('playtime: 4000')
+        self.assertInResponse('playtime: 4')
         self.assertInResponse('OK')
 
+        # Count multiple tracks
+        self.backend.library.dummy_find_exact_result = SearchResult(
+            tracks=[Track(uri='dummy:b', date="2001", length=50000),
+                    Track(uri='dummy:c', date="2001", length=600000)
+                    ]
+            )
         self.sendRequest('count "date" "2001"')
-        self.assertInResponse('songs: 3')
-        self.assertInResponse('playtime: 654000')
+        self.assertInResponse('songs: 2')
+        self.assertInResponse('playtime: 650')
         self.assertInResponse('OK')
 
     def test_findadd(self):