Revert of Include isolate.py in data for Android unit tests

PRESUBMIT_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 glob
+import json
+import os
 import re
 import subprocess
+import sys
 import unittest
 
 import PRESUBMIT
 from PRESUBMIT_test_mocks import MockChange, MockFile, MockAffectedFile
 from PRESUBMIT_test_mocks import MockInputApi, MockOutputApi
 
 _TEST_DATA_DIR = 'base/test/data/presubmit'
 
 class IncludeOrderTest(unittest.TestCase):
   def testSystemHeaderOrder(self):
@@ skipping 807 matching lines @@
 
     output = PRESUBMIT._CheckUserActionUpdate(input_api, MockOutputApi())
     self.assertEqual(
       ('File %s line %d: %s is missing in '
        'tools/metrics/actions/actions.xml. Please run '
        'tools/metrics/actions/extract_actions.py to update.'
        % (file_with_user_action, 1, 'NotInActionsXml')),
       output[0].message)
 
 
-class PydepsNeedsUpdatingTest(unittest.TestCase):
-
-  class MockSubprocess(object):
-    CalledProcessError = subprocess.CalledProcessError
-
-  def setUp(self):
-    mock_all_pydeps = ['A.pydeps', 'B.pydeps']
-    self.old_ALL_PYDEPS_FILES = PRESUBMIT._ALL_PYDEPS_FILES
-    PRESUBMIT._ALL_PYDEPS_FILES = mock_all_pydeps
-    self.mock_input_api = MockInputApi()
-    self.mock_output_api = MockOutputApi()
-    self.mock_input_api.subprocess = PydepsNeedsUpdatingTest.MockSubprocess()
-    self.checker = PRESUBMIT.PydepsChecker(self.mock_input_api, mock_all_pydeps)
-    self.checker._file_cache = {
-        'A.pydeps': '# target: //A.py\n# root: //\nA.py\nC.py\n',
-        'B.pydeps': '# target: //B.py\n# root: //\nB.py\nC.py\n',
-    }
-
-  def tearDown(self):
-    PRESUBMIT._ALL_PYDEPS_FILES = self.old_ALL_PYDEPS_FILES
-
-  def _RunCheck(self):
-    return PRESUBMIT._CheckPydepsNeedsUpdating(self.mock_input_api,
-                                               self.mock_output_api,
-                                               checker_for_tests=self.checker)
-
-  def testAddedPydep(self):
-    self.mock_input_api.files = [
-      MockAffectedFile('new.pydeps', [], action='A'),
-    ]
-
-    results = self._RunCheck()
-    self.assertEqual(1, len(results))
-    self.assertTrue('PYDEPS_FILES' in str(results[0]))
-
-  def testRemovedPydep(self):
-    self.mock_input_api.files = [
-      MockAffectedFile(PRESUBMIT._ALL_PYDEPS_FILES[0], [], action='D'),
-    ]
-
-    results = self._RunCheck()
-    self.assertEqual(1, len(results))
-    self.assertTrue('PYDEPS_FILES' in str(results[0]))
-
-  def testRandomPyIgnored(self):
-    self.mock_input_api.files = [
-      MockAffectedFile('random.py', []),
-    ]
-
-    results = self._RunCheck()
-    self.assertEqual(0, len(results), 'Unexpected results: %r' % results)
-
-  def testRelevantPyNoChange(self):
-    self.mock_input_api.files = [
-      MockAffectedFile('A.py', []),
-    ]
-
-    def mock_check_output(cmd):
-      self.assertEqual('A.py', cmd[3])
-      return self.checker._file_cache['A.pydeps']
-
-    self.mock_input_api.subprocess.check_output = mock_check_output
-
-    results = self._RunCheck()
-    self.assertEqual(0, len(results), 'Unexpected results: %r' % results)
-
-  def testRelevantPyOneChange(self):
-    self.mock_input_api.files = [
-      MockAffectedFile('A.py', []),
-    ]
-
-    def mock_check_output(cmd):
-      self.assertEqual('A.py', cmd[3])
-      return 'changed data'
-
-    self.mock_input_api.subprocess.check_output = mock_check_output
-
-    results = self._RunCheck()
-    self.assertEqual(1, len(results))
-    self.assertTrue('File is stale' in str(results[0]))
-
-  def testRelevantPyTwoChanges(self):
-    self.mock_input_api.files = [
-      MockAffectedFile('C.py', []),
-    ]
-
-    def mock_check_output(cmd):
-      return 'changed data'
-
-    self.mock_input_api.subprocess.check_output = mock_check_output
-
-    results = self._RunCheck()
-    self.assertEqual(2, len(results))
-    self.assertTrue('File is stale' in str(results[0]))
-    self.assertTrue('File is stale' in str(results[1]))
-
-
 class LogUsageTest(unittest.TestCase):
 
   def testCheckAndroidCrLogUsage(self):
     mock_input_api = MockInputApi()
     mock_output_api = MockOutputApi()
 
     mock_input_api.files = [
       MockAffectedFile('RandomStuff.java', [
         'random stuff'
       ]),
@@ skipping 137 matching lines @@
                ['char* host = "https://www.aol.com"; // google.com'])
     ]
 
     warnings = PRESUBMIT._CheckHardcodedGoogleHostsInLowerLayers(
       input_api, MockOutputApi())
     self.assertEqual(0, len(warnings))
 
 
 if __name__ == '__main__':
   unittest.main()