Always treat TokenError as fatal error.

client/tests/auth_server_test.py

 #!/usr/bin/env python
 # Copyright 2016 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import contextlib
 import json
 import logging
 import os
 import socket
@@ skipping 98 matching lines @@
       del calls[:]
 
       # First token has expired. Generated new one.
       self.mock_time(300)
       resp = call_rpc('acc_1', ['A', 'B', 'C'])
       self.assertEqual(
           {u'access_token': u'tok_acc_1', u'expiry': self.epoch + 600}, resp)
       self.assertEqual([('acc_1', ('A', 'B', 'C'))], calls)
 
   def test_handles_token_errors(self):
-    fatal = False
-    code = 123
+    calls = []
     def token_gen(_account_id, _scopes):
-      raise auth_server.TokenError(code, 'error message', fatal=fatal)
+      calls.append(1)
+      raise auth_server.TokenError(123, 'error message')
 
     with local_auth_server(token_gen, 'acc_1'):
       self.assertEqual(
           {u'error_code': 123, u'error_message': u'error message'},
           call_rpc('acc_1', ['B', 'B', 'A', 'C']))
+      self.assertEqual(1, len(calls))
 
-      # Non-fatal errors aren't cached.
-      code = 456
+      # Errors are cached. Same error is returned.
       self.assertEqual(
-          {u'error_code': 456, u'error_message': u'error message'},
+          {u'error_code': 123, u'error_message': u'error message'},
           call_rpc('acc_1', ['B', 'B', 'A', 'C']))
-
-      # Fatal errors are cached.
-      fatal = True
-      code = 789
-      self.assertEqual(
-          {u'error_code': 789, u'error_message': u'error message'},
-          call_rpc('acc_1', ['B', 'B', 'A', 'C']))
-
-      # Same cached error.
-      code = 111
-      self.assertEqual(
-          {u'error_code': 789, u'error_message': u'error message'},
-          call_rpc('acc_1', ['B', 'B', 'A', 'C']))
+      self.assertEqual(1, len(calls))
 
   def test_http_level_errors(self):
     def token_gen(_account_id, _scopes):
       self.fail('must not be called')
 
     with local_auth_server(token_gen, 'acc_1'):
       # Wrong URL.
       ctx = luci_context.read('local_auth')
       r = requests.post(
           url='http://127.0.0.1:%d/blah/LuciLocalAuthService.GetOAuthToken' %
@@ skipping 218 matching lines @@
       service = self.mocked_http_service(perform_request=handle_request)
       self.assertEqual(service.request(request_url, data={}).read(), response)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.CRITICAL)
   global_test_setup()
   unittest.main()