| Index: tests/swarming_test.py
|
| diff --git a/tests/swarming_test.py b/tests/swarming_test.py
|
| index 91a171bd690a1ca228389fe0ae0034290cf912df..aba563069daaa15463802bf74503bf06b6c80cc6 100755
|
| --- a/tests/swarming_test.py
|
| +++ b/tests/swarming_test.py
|
| @@ -416,7 +416,6 @@ def generate_expected_json(
|
| 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',
|
| @@ -429,7 +428,7 @@ def generate_expected_json(
|
| 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,
|
| @@ -482,11 +481,11 @@ class ManifestTest(auto_stub.TestCase):
|
|
|
| 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,
|
| @@ -510,11 +509,11 @@ class ManifestTest(auto_stub.TestCase):
|
| 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,
|
| @@ -535,11 +534,11 @@ class ManifestTest(auto_stub.TestCase):
|
|
|
| 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,
|
|
|