run_isolated.py: install CIPD packages

client/tests/swarming_test.py

 #!/usr/bin/env python
 # Copyright 2013 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 datetime
 import hashlib
 import json
 import logging
 import os
@@ skipping 14 matching lines @@
 import auth
 import isolateserver
 import swarming
 import test_utils
 
 from depot_tools import fix_encoding
 from utils import file_path
 from utils import logging_utils
 from utils import tools
 
+import httpserver_mock
 import isolateserver_mock
 
 
 FILE_HASH = u'1' * 40
 TEST_NAME = u'unit_tests'
 
 
 OUTPUT = 'Ran stuff\n'
 
 SHARD_OUTPUT_1 = 'Shard 1 of 3.'
@@ skipping 103 matching lines @@
 class NonBlockingEvent(threading._Event):  # pylint: disable=W0212
   """Just like threading.Event, but a class and ignores timeout in 'wait'.
 
   Intended to be used as a mock for threading.Event in tests.
   """
 
   def wait(self, timeout=None):
     return super(NonBlockingEvent, self).wait(0)
 
 
-class SwarmingServerHandler(isolateserver_mock.MockHandler):
+class SwarmingServerHandler(httpserver_mock.MockHandler):
   """An extremely minimal implementation of the swarming server API v1.0."""
 
   def do_GET(self):
     logging.info('S GET %s', self.path)
     if self.path in ('/on/load', '/on/quit'):
       self._octet_stream('')
     elif self.path == '/auth/api/v1/server/oauth_config':
       self._json({
           'client_id': 'c',
           'client_not_so_secret': 's',
           'primary_url': self.server.url})
     elif self.path == '/auth/api/v1/accounts/self':
       self._json({'identity': 'user:joe', 'xsrf_token': 'foo'})
     else:
       m = re.match(r'/_ah/api/swarming/v1/task/(\d+)/request', self.path)
       if m:
         logging.info('%s', m.group(1))
         self._json(self.server.tasks[int(m.group(1))])
       else:
         self._json( {'a': 'b'})
         #raise NotImplementedError(self.path)
 
   def do_POST(self):
     logging.info('POST %s', self.path)
     raise NotImplementedError(self.path)
 
 
-class MockSwarmingServer(isolateserver_mock.MockServer):
+class MockSwarmingServer(httpserver_mock.MockServer):
   _HANDLER_CLS = SwarmingServerHandler
 
   def __init__(self):
     super(MockSwarmingServer, self).__init__()
     self._server.tasks = {}
 
 
 class Common(object):
   def setUp(self):
     self._tempdir = None
@@ skipping 1187 matching lines @@
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.CRITICAL)
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   for e in ('ISOLATE_SERVER', 'SWARMING_TASK_ID', 'SWARMING_SERVER'):
     os.environ.pop(e, None)
   unittest.main()