1 files changed, 19 insertions, 9 deletions

diff --git a/tests/test_pydora/test_utils.py b/tests/test_pydora/test_utils.py
index 5334ff6..9900913 100644
--- a/tests/test_pydora/test_utils.py
+++ b/tests/test_pydora/test_utils.py
@@ -16,11 +16,16 @@ class TestIterateForever(TestCase):
 
     def test_handle_missing_params_exception_due_to_missing_ad_tokens(self):
         with patch.object(APIClient, 'get_playlist') as get_playlist_mock:
-            with patch.object(APIClient, 'register_ad', side_effect=ParameterMissing("ParameterMissing")):
+            admock = patch.object(
+                APIClient, 'register_ad',
+                side_effect=ParameterMissing("ParameterMissing"))
 
-                station = Station.from_json(self.client, {'stationToken': 'token_mock'})
-                ad_mock = AdItem.from_json(self.client, {'station_id': 'id_mock'})
-                get_playlist_mock.return_value=iter([ad_mock])
+            with admock:
+                station = Station.from_json(
+                    self.client, {'stationToken': 'token_mock'})
+                ad_mock = AdItem.from_json(
+                    self.client, {'station_id': 'id_mock'})
+                get_playlist_mock.return_value = iter([ad_mock])
 
                 station_iter = iterate_forever(station.get_playlist)
 
@@ -28,12 +33,17 @@ class TestIterateForever(TestCase):
                 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):
+        plmock = patch.object(
+            APIClient, 'get_playlist',
+            side_effect=ParameterMissing("ParameterMissing"))
 
-                    station = Station.from_json(self.client, {'stationToken': 'token_mock'})
-                    track_mock = PlaylistItem.from_json(self.client, {'token': 'token_mock'})
-                    get_playlist_mock.return_value=iter([track_mock])
+        with plmock as get_playlist_mock:
+                with self.assertRaises(ParameterMissing):
+                    station = Station.from_json(
+                        self.client, {'stationToken': 'token_mock'})
+                    track_mock = PlaylistItem.from_json(
+                        self.client, {'token': 'token_mock'})
+                    get_playlist_mock.return_value = iter([track_mock])
 
                     station_iter = iterate_forever(station.get_playlist)
                     next(station_iter)