Fix to ensure InvalidAuthToken exceptions result in re-authentication and retry.

2 files changed, 28 insertions, 10 deletions

diff --git a/pandora/transport.py b/pandora/transport.py
index bba1608..cdd1699 100644
--- a/pandora/transport.py
+++ b/pandora/transport.py
@@ -50,7 +50,7 @@ def retries(max_tries, exceptions=(Exception,)):
                     # Don't retry for PandoraExceptions - unlikely that result
                     # will change for same set of input parameters.
                     if isinstance(e, PandoraException):
-                        break
+                        raise
                     if retries_left > 0:
                         time.sleep(delay_exponential(
                             0.5, 2, max_tries - retries_left))
diff --git a/tests/test_pandora/test_transport.py b/tests/test_pandora/test_transport.py
index 394916b..1393b7d 100644
--- a/tests/test_pandora/test_transport.py
+++ b/tests/test_pandora/test_transport.py
@@ -1,6 +1,6 @@
 import time
 from unittest import TestCase
-from pandora.errors import PandoraException
+from pandora.errors import InvalidAuthToken, PandoraException
 
 from pandora.py2compat import Mock, call
 
@@ -28,14 +28,32 @@ class TestTransport(TestCase):
         assert client.transport._start_request.call_count == 5
 
     def test_call_should_not_retry_for_pandora_exceptions(self):
-        client = TestSettingsDictBuilder._build_minimal()
+        with self.assertRaises(PandoraException):
+            client = TestSettingsDictBuilder._build_minimal()
+
+            time.sleep = Mock()
+            client.transport._make_http_request = Mock(
+                    side_effect=PandoraException("error_mock"))
+            client.transport._start_request = Mock()
 
-        time.sleep = Mock()
-        client.transport._make_http_request = Mock(
-                side_effect=PandoraException("error_mock"))
-        client.transport._start_request = Mock()
+            client("method")
 
-        client("method")
+            client.transport._start_request.assert_has_calls([call("method")])
+            assert client.transport._start_request.call_count == 1
 
-        client.transport._start_request.assert_has_calls([call("method")])
-        assert client.transport._start_request.call_count == 1
+    def test_call_should_retry_if_auth_token_expired(self):
+        with self.assertRaises(InvalidAuthToken):
+            client = TestSettingsDictBuilder._build_minimal()
+
+            time.sleep = Mock()
+            client.transport._make_http_request = Mock(
+                    side_effect=InvalidAuthToken("error_mock"))
+            client.transport._start_request = Mock()
+
+            client._authenticate = Mock()
+
+            client("method")
+
+            client.transport._start_request.assert_has_calls([call("method")])
+            assert client.transport._start_request.call_count == 2
+            assert client._authenticate.call_count == 1