aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2016-01-09 14:04:39 -0800
committerMike Crute <mcrute@gmail.com>2016-01-09 14:04:39 -0800
commit4603c5ab3818abd2ea8550bf4cade7dd33ad5f98 (patch)
tree61590c9ed1389748a672d3bcb5d73f2621d5120a
parentcedd57fbe4a40c171847de1ad0c714b5447d8065 (diff)
downloadpydora-4603c5ab3818abd2ea8550bf4cade7dd33ad5f98.tar.bz2
pydora-4603c5ab3818abd2ea8550bf4cade7dd33ad5f98.tar.xz
pydora-4603c5ab3818abd2ea8550bf4cade7dd33ad5f98.zip
PEP8 Test Cleanup
-rw-r--r--tests/test_pandora/test_client.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/test_pandora/test_client.py b/tests/test_pandora/test_client.py
index cf486e0..f7f0574 100644
--- a/tests/test_pandora/test_client.py
+++ b/tests/test_pandora/test_client.py
@@ -1,7 +1,7 @@
1from unittest import TestCase 1from unittest import TestCase
2 2
3from pandora import errors
3from pandora.client import APIClient, BaseAPIClient 4from pandora.client import APIClient, BaseAPIClient
4from pandora.errors import InvalidAuthToken, ParameterMissing
5from pandora.py2compat import Mock, call, patch 5from pandora.py2compat import Mock, call, patch
6from tests.test_pandora.test_models import TestAdItem 6from tests.test_pandora.test_models import TestAdItem
7 7
@@ -46,7 +46,7 @@ class TestAPIClientLogin(TestCase):
46class TestCallingAPIClient(TestCase): 46class TestCallingAPIClient(TestCase):
47 47
48 def test_call_should_retry_on_token_error(self): 48 def test_call_should_retry_on_token_error(self):
49 transport = Mock(side_effect=[InvalidAuthToken(), None]) 49 transport = Mock(side_effect=[errors.InvalidAuthToken(), None])
50 50
51 client = BaseAPIClient(transport, None, None, None) 51 client = BaseAPIClient(transport, None, None, None)
52 client._authenticate = Mock() 52 client._authenticate = Mock()
@@ -59,7 +59,7 @@ class TestCallingAPIClient(TestCase):
59 59
60 def test_ad_support_enabled_parameters(self): 60 def test_ad_support_enabled_parameters(self):
61 with patch.object(APIClient, '__call__') as playlist_mock: 61 with patch.object(APIClient, '__call__') as playlist_mock:
62 transport = Mock(side_effect=[InvalidAuthToken(), None]) 62 transport = Mock(side_effect=[errors.InvalidAuthToken(), None])
63 63
64 client = APIClient(transport, None, None, None, None) 64 client = APIClient(transport, None, None, None, None)
65 client._authenticate = Mock() 65 client._authenticate = Mock()
@@ -97,8 +97,9 @@ class TestGettingQualities(TestCase):
97class TestGettingAds(TestCase): 97class TestGettingAds(TestCase):
98 98
99 def test_get_ad_item_(self): 99 def test_get_ad_item_(self):
100 with patch.object(APIClient, '__call__', return_value=TestAdItem.JSON_DATA) as ad_metadata_mock: 100 with patch.object(APIClient, '__call__',
101 transport = Mock(side_effect=[InvalidAuthToken(), None]) 101 return_value=TestAdItem.JSON_DATA) as ad_metadata_mock:
102 transport = Mock(side_effect=[errors.InvalidAuthToken(), None])
102 103
103 client = APIClient(transport, None, None, None, None) 104 client = APIClient(transport, None, None, None, None)
104 client._authenticate = Mock() 105 client._authenticate = Mock()
@@ -108,14 +109,15 @@ class TestGettingAds(TestCase):
108 assert ad_item.ad_token == 'token_mock' 109 assert ad_item.ad_token == 'token_mock'
109 110
110 ad_metadata_mock.assert_has_calls([call("ad.getAdMetadata", 111 ad_metadata_mock.assert_has_calls([call("ad.getAdMetadata",
111 adToken='token_mock', 112 adToken='token_mock',
112 returnAdTrackingTokens=True, 113 returnAdTrackingTokens=True,
113 supportAudioAds=True)]) 114 supportAudioAds=True)])
114 115
115 def test_get_ad_item_with_no_station_id_specified_raises_exception(self): 116 def test_get_ad_item_with_no_station_id_specified_raises_exception(self):
116 transport = Mock(side_effect=[InvalidAuthToken(), None]) 117 transport = Mock(side_effect=[errors.InvalidAuthToken(), None])
117 118
118 client = APIClient(transport, None, None, None, None) 119 client = APIClient(transport, None, None, None, None)
119 client.get_ad_metadata = Mock() 120 client.get_ad_metadata = Mock()
120 121
121 self.assertRaises(ParameterMissing, client.get_ad_item, '', 'token_mock') 122 self.assertRaises(
123 errors.ParameterMissing, client.get_ad_item, '', 'token_mock')