1
=== modified file 'src/unity_songkick_daemon.py'
2
--- src/unity_songkick_daemon.py	2013-09-24 22:21:01 +0000
3
+++ src/unity_songkick_daemon.py	2013-10-03 19:30:01 +0000
4
@@ -74,13 +74,12 @@
5
74
        response = urllib.request.urlopen(uri).read()
74
        response = urllib.request.urlopen(uri).read()
6
75
        response = response.decode('utf8')
75
        response = response.decode('utf8')
7
76
        json_response = json.loads(response)
76
        json_response = json.loads(response)
9
77
        result = json_response['resultsPage']['results']['event']
77
        result = json_response['resultsPage']['results'].get('event', [])
10
78
    except Exception:
78
    except Exception:
11
79
        logger.exception("Error while fetching: %r", uri)
79
        logger.exception("Error while fetching: %r", uri)
13
80
        result = {}
80
        result = []
14
81
    if result:
81
    if result:
15
82
        for item in result:
82
        for item in result:
16
83
17
84
            icon_hint = ""
83
            icon_hint = ""
18
85
            for artist in item['performance']:
84
            for artist in item['performance']:
19
86
                #if artist['artist']['displayName'].lower() == search.replace("%20", " "):
85
                #if artist['artist']['displayName'].lower() == search.replace("%20", " "):
20
87
86
21
=== added file 'tests/data/mock_songkick_empty'
22
--- tests/data/mock_songkick_empty	1970-01-01 00:00:00 +0000
23
+++ tests/data/mock_songkick_empty	2013-10-03 19:30:01 +0000
24
@@ -0,0 +1,2 @@
25
1
{"resultsPage":{"status":"ok","results":{},"perPage":50,"page":1,"totalEntries":0}}
26
2
27
0
3
28
=== modified file 'tests/test_songkick.py'
29
--- tests/test_songkick.py	2013-09-25 02:59:30 +0000
30
+++ tests/test_songkick.py	2013-10-03 19:30:01 +0000
31
@@ -1,8 +1,10 @@
32
1
#! /usr/bin/python3
1
#! /usr/bin/python3
33
2
# -*- coding: utf-8 -*-
2
# -*- coding: utf-8 -*-
34
3
import imp
35
4
import logging
36
5
37
3
from gi.repository import Unity
6
from gi.repository import Unity
38
4
from unittest import TestCase
7
from unittest import TestCase
39
5
import imp
40
6
8
41
7
9
42
8
class ResultSet(Unity.ResultSet):
10
class ResultSet(Unity.ResultSet):
43
@@ -43,18 +45,35 @@
44
43
        expected_results = ["http://www.songkick.com/concerts/15019954-black-rebel-motorcycle-club-at-academy?utm_source=18004&utm_medium=partner",
45
        expected_results = ["http://www.songkick.com/concerts/15019954-black-rebel-motorcycle-club-at-academy?utm_source=18004&utm_medium=partner",
45
44
                            "Black Rebel Motorcycle Club at Academy (March 11, 2013)"]
46
                            "Black Rebel Motorcycle Club at Academy (March 11, 2013)"]
46
45
        results = []
47
        results = []
51
46
        for s in ['empathy']:
48
        result_set = self.perform_query("Black")
52
47
            result_set = self.perform_query(s)
49
        results.append(result_set.results[0]['uri'])
53
48
            results.append(result_set.results[0]['uri'])
50
        results.append(result_set.results[0]['title'])
50
49
            results.append(result_set.results[0]['title'])
54
50
        self.assertEqual(results, expected_results)
51
        self.assertEqual(results, expected_results)
55
51
52
58
52
53
    def test_failing_search(self):
57
53
    def test_questions_failing_search(self):
59
54
        self.scope_module.SEARCH_URI = 'file:tests/data/mock_songkick_fail#'
54
        self.scope_module.SEARCH_URI = 'file:tests/data/mock_songkick_fail#'
63
55
        for s in ['empathy']:
55
        result_set = self.perform_query("empathy")
64
56
            result_set = self.perform_query(s)
56
        self.assertEqual(len(result_set.results), 0)
65
57
            self.assertEqual(len(result_set.results), 0)
57
66
58
    def test_empty_result(self):
67
59
        self.scope_module.SEARCH_URI = 'file:tests/data/mock_songkick_empty#'
68
60
        handler = Handler()
69
61
        handler.setLevel(logging.ERROR)
70
62
        self.scope_module.logger.addHandler(handler)
71
63
        result_set = self.perform_query("foo")
72
64
        self.assertEqual(len(result_set.results), 0)
73
65
        self.assertEqual(len(handler.records), 0)
74
66
75
67
76
68
class Handler(logging.Handler):
77
69
    """Log handler to capture messages."""
78
70
79
71
    def __init__(self):
80
72
        super(Handler, self).__init__()
81
73
        self.records = []
82
74
83
75
    def emit(self, record):
84
76
        self.records.append(record)
85
58
77
86
59
if __name__ == '__main__':
78
if __name__ == '__main__':
87
60
    unittest.main()
79
    unittest.main()
Status:	Merged
Approved by:	Guillermo Gonzalez on 2013-10-03
Approved revision:	16
Merged at revision:	15
Proposed branch:	lp:~verterok/unity-scope-songkick/empty-response
Merge into:	lp:unity-scope-songkick
Diff against target:	87 lines (+33/-13) 3 files modified src/unity_songkick_daemon.py (+2/-3) tests/data/mock_songkick_empty (+2/-0) tests/test_songkick.py (+29/-10)
To merge this branch:	bzr merge lp:~verterok/unity-scope-songkick/empty-response
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-10-03
Facundo Batista (community)		2013-10-03	Approve on 2013-10-03
Review via email: mp+189163@code.launchpad.net