diff options
author | jcass <john.cass77@gmail.com> | 2015-12-24 21:58:03 +0200 |
---|---|---|
committer | jcass <john.cass77@gmail.com> | 2015-12-24 21:58:03 +0200 |
commit | 0d2a42c65aae90295b3c9e9e717375d114b9eee4 (patch) | |
tree | 0c4211ef2c682354288d149b7ebf776276b02380 /tests | |
parent | 79245f34a8abdc296157b78b879994a2738f02e3 (diff) | |
download | pydora-0d2a42c65aae90295b3c9e9e717375d114b9eee4.tar.bz2 pydora-0d2a42c65aae90295b3c9e9e717375d114b9eee4.tar.xz pydora-0d2a42c65aae90295b3c9e9e717375d114b9eee4.zip |
Fix mock import statements.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_pandora/test_models.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_pandora/test_models.py b/tests/test_pandora/test_models.py index bb9e00a..ecd8cf1 100644 --- a/tests/test_pandora/test_models.py +++ b/tests/test_pandora/test_models.py | |||
@@ -1,6 +1,6 @@ | |||
1 | from unittest import TestCase | 1 | from unittest import TestCase |
2 | from datetime import datetime | 2 | from datetime import datetime |
3 | from mock import mock | 3 | from pandora.py2compat import Mock, patch |
4 | from pandora import APIClient | 4 | from pandora import APIClient |
5 | from pandora.models.pandora import AdItem, PlaylistModel | 5 | from pandora.models.pandora import AdItem, PlaylistModel |
6 | 6 | ||
@@ -221,7 +221,7 @@ class TestAdItem(TestCase): | |||
221 | } | 221 | } |
222 | 222 | ||
223 | def setUp(self): | 223 | def setUp(self): |
224 | api_client_mock = mock.PropertyMock(spec=APIClient) | 224 | api_client_mock = Mock(spec=APIClient) |
225 | api_client_mock.default_audio_quality = APIClient.HIGH_AUDIO_QUALITY | 225 | api_client_mock.default_audio_quality = APIClient.HIGH_AUDIO_QUALITY |
226 | self.result = AdItem.from_json(api_client_mock, self.JSON_DATA) | 226 | self.result = AdItem.from_json(api_client_mock, self.JSON_DATA) |
227 | 227 | ||
@@ -229,15 +229,15 @@ class TestAdItem(TestCase): | |||
229 | assert self.result.is_ad is True | 229 | assert self.result.is_ad is True |
230 | 230 | ||
231 | def test_register_ad(self): | 231 | def test_register_ad(self): |
232 | self.result._api_client.register_ad = mock.PropertyMock() | 232 | self.result._api_client.register_ad = Mock() |
233 | self.result.register_ad('id_dummy') | 233 | self.result.register_ad('id_dummy') |
234 | 234 | ||
235 | assert self.result._api_client.register_ad.called | 235 | assert self.result._api_client.register_ad.called |
236 | 236 | ||
237 | def test_prepare_playback(self): | 237 | def test_prepare_playback(self): |
238 | with mock.patch.object(PlaylistModel, 'prepare_playback') as super_mock: | 238 | with patch.object(PlaylistModel, 'prepare_playback') as super_mock: |
239 | 239 | ||
240 | self.result.register_ad = mock.PropertyMock() | 240 | self.result.register_ad = Mock() |
241 | self.result.prepare_playback() | 241 | self.result.prepare_playback() |
242 | assert self.result.register_ad.called | 242 | assert self.result.register_ad.called |
243 | assert super_mock.called | 243 | assert super_mock.called |