Handle IOErrors and ValueErrors when attempting to register ads.

3 files changed, 24 insertions, 15 deletions

diff --git a/tests/test_pandora/test_models.py b/tests/test_pandora/test_models.py
index ecd8cf1..06c988c 100644
--- a/tests/test_pandora/test_models.py
+++ b/tests/test_pandora/test_models.py
@@ -205,19 +205,19 @@ class TestAdItem(TestCase):
     JSON_DATA = {
         'audioUrlMap': {
             'mediumQuality': {
-                'audioUrl': 'mock_med_url', 'bitrate': '64', 'protocol': 'http', 'encoding': 'aacplus'
+                'audioUrl': 'med_url_mock', 'bitrate': '64', 'protocol': 'http', 'encoding': 'aacplus'
             },
             'highQuality': {
-                'audioUrl': 'mock_high_url', 'bitrate': '64', 'protocol': 'http', 'encoding': 'aacplus'
+                'audioUrl': 'high_url_mock', 'bitrate': '64', 'protocol': 'http', 'encoding': 'aacplus'
             },
             'lowQuality': {
-                'audioUrl': 'mock_low_url', 'bitrate': '32', 'protocol': 'http', 'encoding': 'aacplus'}},
-            'clickThroughUrl': 'mock_click_url',
-            'imageUrl': 'mock_img_url',
+                'audioUrl': 'low_url_mock', 'bitrate': '32', 'protocol': 'http', 'encoding': 'aacplus'}},
+            'clickThroughUrl': 'click_url_mock',
+            'imageUrl': 'img_url_mock',
             'companyName': '',
             'title': '',
             'trackGain': '0.0',
-            'adTrackingTokens': ['mock_token_1', 'mock_token_2']
+            'adTrackingTokens': ['token_1_mock', 'token_2_mock']
     }
 
     def setUp(self):
@@ -230,10 +230,19 @@ class TestAdItem(TestCase):
 
     def test_register_ad(self):
         self.result._api_client.register_ad = Mock()
-        self.result.register_ad('id_dummy')
+        self.result.register_ad('id_mock')
 
         assert self.result._api_client.register_ad.called
 
+    def test_register_ad_raises_exception_if_no_tracking_tokens_available(self):
+        with self.assertRaises(ValueError):
+            self.result.tracking_tokens = []
+            self.result._api_client.register_ad = Mock(spec=AdItem)
+
+            self.result.register_ad('id_mock')
+
+            assert self.result._api_client.register_ad.called
+
     def test_prepare_playback(self):
         with patch.object(PlaylistModel, 'prepare_playback') as super_mock:
 
diff --git a/tests/test_pandora/test_transport.py b/tests/test_pandora/test_transport.py
index 59d4cea..bdd549c 100644
--- a/tests/test_pandora/test_transport.py
+++ b/tests/test_pandora/test_transport.py
@@ -6,7 +6,7 @@ from pandora.py2compat import Mock, call
 from tests.test_pandora.test_clientbuilder import TestSettingsDictBuilder
 
 
-class SysCallError(Exception):
+class SysCallError(IOError):
     pass
 
 
diff --git a/tests/test_pydora/test_utils.py b/tests/test_pydora/test_utils.py
index 64cdf74..e5a81b5 100644
--- a/tests/test_pydora/test_utils.py
+++ b/tests/test_pydora/test_utils.py
@@ -18,22 +18,22 @@ class TestIterateForever(TestCase):
         with patch.object(APIClient, 'get_playlist') as get_playlist_mock:
             with patch.object(APIClient, 'register_ad', side_effect=ParameterMissing("ParameterMissing")):
 
-                station = Station.from_json(self.client, {'stationToken': 'dummy_token'})
-                dummy_ad = AdItem.from_json(self.client, {'station_id': 'dummy_id'})
-                get_playlist_mock.return_value=iter([dummy_ad])
+                station = Station.from_json(self.client, {'stationToken': 'mock_token'})
+                ad_mock = AdItem.from_json(self.client, {'station_id': 'mock_id'})
+                get_playlist_mock.return_value=iter([ad_mock])
 
                 station_iter = iterate_forever(station.get_playlist)
 
                 next_track = station_iter.next()
-                self.assertEqual(dummy_ad, next_track)
+                self.assertEqual(ad_mock, next_track)
 
     def test_reraise_missing_params_exception(self):
         with patch.object(APIClient, 'get_playlist', side_effect=ParameterMissing("ParameterMissing")) as get_playlist_mock:
                 with self.assertRaises(ParameterMissing):
 
-                    station = Station.from_json(self.client, {'stationToken': 'dummy_token'})
-                    dummy_track = PlaylistItem.from_json(self.client, {'token': 'dummy_token'})
-                    get_playlist_mock.return_value=iter([dummy_track])
+                    station = Station.from_json(self.client, {'stationToken': 'mock_token'})
+                    mock_track = PlaylistItem.from_json(self.client, {'token': 'mock_token'})
+                    get_playlist_mock.return_value=iter([mock_track])
 
                     station_iter = iterate_forever(station.get_playlist)
                     station_iter.next()