Fix running 'import run_isolated' at python interactive prompt.

tests/swarming_test.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import hashlib
 import json
 import logging
 import os
 import StringIO
@@ skipping 398 matching lines @@
     }
   ]
 
 
 def generate_expected_json(
     shards,
     slave_os,
     working_dir,
     isolate_server,
     profile):
-  retrieval_url = isolate_server + u'/content/retrieve/default/'
   os_value = unicode(swarming.PLATFORM_MAPPING_SWARMING[slave_os])
   expected = {
     u'cleanup': u'root',
     u'configurations': [
       {
         u'config_name': os_value,
         u'dimensions': {
           u'os': os_value,
         },
         u'min_instances': shards,
       },
     ],
-    u'data': [[retrieval_url, u'swarm_data.zip']],
+    u'data': [],
     u'env_vars': {},
     u'restart_on_failure': True,
     u'test_case_name': TEST_NAME,
     u'tests': chromium_tasks(isolate_server),
     u'working_dir': unicode(working_dir),
     u'priority': 101,
   }
   if shards > 1:
     expected[u'env_vars'][u'GTEST_SHARD_INDEX'] = u'%(instance_index)s'
     expected[u'env_vars'][u'GTEST_TOTAL_SHARDS'] = u'%(num_instances)s'
@@ skipping 32 matching lines @@
   def _check_output(self, out, err):
     self.assertEqual(out, sys.stdout.getvalue())
     self.assertEqual(err, sys.stderr.getvalue())
 
     # Flush their content by mocking them again.
     self.mock(sys, 'stdout', StringIO.StringIO())
     self.mock(sys, 'stderr', StringIO.StringIO())
 
   def test_basic_manifest(self):
     manifest = swarming.Manifest(
-        manifest_hash=FILE_HASH,
+        isolated_hash=FILE_HASH,
         test_name=TEST_NAME,
         shards=2,
         test_filter='*',
-        slave_os='win32',
+        slave_os='Windows',
         working_dir='swarm_tests',
         isolate_server='http://localhost:8081',
         verbose=False,
         profile=False,
         priority=101,
         algo=ALGO)
 
     swarming.chromium_setup(manifest)
     manifest_json = json.loads(manifest.to_json())
 
     expected = generate_expected_json(
         shards=2,
         slave_os='win32',
         working_dir='swarm_tests',
         isolate_server=u'http://localhost:8081',
         profile=False)
     self.assertEqual(expected, manifest_json)
 
   def test_basic_linux(self):
     """A basic linux manifest test to ensure that windows specific values
        aren't used.
     """
     manifest = swarming.Manifest(
-        manifest_hash=FILE_HASH,
+        isolated_hash=FILE_HASH,
         test_name=TEST_NAME,
         shards=1,
         test_filter='*',
-        slave_os='linux2',
+        slave_os='Linux',
         working_dir='swarm_tests',
         isolate_server='http://localhost:8081',
         verbose=False,
         profile=False,
         priority=101,
         algo=ALGO)
 
     swarming.chromium_setup(manifest)
     manifest_json = json.loads(manifest.to_json())
 
     expected = generate_expected_json(
         shards=1,
         slave_os='linux2',
         working_dir='swarm_tests',
         isolate_server=u'http://localhost:8081',
         profile=False)
     self.assertEqual(expected, manifest_json)
 
   def test_basic_linux_profile(self):
     manifest = swarming.Manifest(
-        manifest_hash=FILE_HASH,
+        isolated_hash=FILE_HASH,
         test_name=TEST_NAME,
         shards=1,
         test_filter='*',
-        slave_os='linux2',
+        slave_os='Linux',
         working_dir='swarm_tests',
         isolate_server='http://localhost:8081',
         verbose=False,
         profile=True,
         priority=101,
         algo=ALGO)
 
     swarming.chromium_setup(manifest)
     manifest_json = json.loads(manifest.to_json())
 
@@ skipping 68 matching lines @@
           'Usage: swarming.py trigger [options]\n\n'
           'swarming.py: error: At least one --task is required.\n')
 
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   unittest.main()