Merge lp:~verterok/unity-scope-songkick/empty-response into lp:unity-scope-songkick

[Guillermo Gonzalez]

Handle empty result

Handle empty result

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-ci/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-armhf-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-i386-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-songkick-ci/6/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verterok/unity-scope-songkick/empty-response]

16. By Guillermo Gonzalez on 2013-10-03

add test data file

[Facundo Batista (facundo)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-songkick-ci/7/rebuild

review: Approve (continuous-integration)

=== modified file 'src/unity_songkick_daemon.py'
--- src/unity_songkick_daemon.py	2013-09-24 22:21:01 +0000
+++ src/unity_songkick_daemon.py	2013-10-03 19:30:01 +0000
@@ -74,13 +74,12 @@
         response = urllib.request.urlopen(uri).read()
         response = response.decode('utf8')
         json_response = json.loads(response)
-        result = json_response['resultsPage']['results']['event']
+        result = json_response['resultsPage']['results'].get('event', [])
     except Exception:
         logger.exception("Error while fetching: %r", uri)
-        result = {}
+        result = []
     if result:
         for item in result:
-
             icon_hint = ""
             for artist in item['performance']:
                 #if artist['artist']['displayName'].lower() == search.replace("%20", " "):

=== added file 'tests/data/mock_songkick_empty'
--- tests/data/mock_songkick_empty	1970-01-01 00:00:00 +0000
+++ tests/data/mock_songkick_empty	2013-10-03 19:30:01 +0000
@@ -0,0 +1,2 @@
+{"resultsPage":{"status":"ok","results":{},"perPage":50,"page":1,"totalEntries":0}}
+

=== modified file 'tests/test_songkick.py'
--- tests/test_songkick.py	2013-09-25 02:59:30 +0000
+++ tests/test_songkick.py	2013-10-03 19:30:01 +0000
@@ -1,8 +1,10 @@
 #! /usr/bin/python3
 # -*- coding: utf-8 -*-
+import imp
+import logging
+
 from gi.repository import Unity
 from unittest import TestCase
-import imp
 
 
 class ResultSet(Unity.ResultSet):
@@ -43,18 +45,35 @@
         expected_results = ["http://www.songkick.com/concerts/15019954-black-rebel-motorcycle-club-at-academy?utm_source=18004&utm_medium=partner",
                             "Black Rebel Motorcycle Club at Academy (March 11, 2013)"]
         results = []
-        for s in ['empathy']:
-            result_set = self.perform_query(s)
-            results.append(result_set.results[0]['uri'])
-            results.append(result_set.results[0]['title'])
+        result_set = self.perform_query("Black")
+        results.append(result_set.results[0]['uri'])
+        results.append(result_set.results[0]['title'])
         self.assertEqual(results, expected_results)
 
-
-    def test_questions_failing_search(self):
+    def test_failing_search(self):
         self.scope_module.SEARCH_URI = 'file:tests/data/mock_songkick_fail#'
-        for s in ['empathy']:
-            result_set = self.perform_query(s)
-            self.assertEqual(len(result_set.results), 0)
+        result_set = self.perform_query("empathy")
+        self.assertEqual(len(result_set.results), 0)
+
+    def test_empty_result(self):
+        self.scope_module.SEARCH_URI = 'file:tests/data/mock_songkick_empty#'
+        handler = Handler()
+        handler.setLevel(logging.ERROR)
+        self.scope_module.logger.addHandler(handler)
+        result_set = self.perform_query("foo")
+        self.assertEqual(len(result_set.results), 0)
+        self.assertEqual(len(handler.records), 0)
+
+
+class Handler(logging.Handler):
+    """Log handler to capture messages."""
+
+    def __init__(self):
+        super(Handler, self).__init__()
+        self.records = []
+
+    def emit(self, record):
+        self.records.append(record)
 
 if __name__ == '__main__':
     unittest.main()