Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: PRESUBMIT_test.py

Issue 1839103002: Revert of Include isolate.py in data for Android unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « PRESUBMIT.py ('k') | PRESUBMIT_test_mocks.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: PRESUBMIT_test.py
diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index c615c6b733cf17c94dfe142faa3ee411addae2aa..90a8dafd07a3fe026d7a951b80772cc0f53626ef 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -3,8 +3,12 @@
# 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
@@ -832,102 +836,6 @@
output[0].message)
-class PydepsNeedsUpdatingTest(unittest.TestCase):
-
- class MockSubprocess(object):
- CalledProcessError = subprocess.CalledProcessError
-
- def setUp(self):
- self.old_PYDEPS_FILES = PRESUBMIT._PYDEPS_FILES
- PRESUBMIT._PYDEPS_FILES = ['A.pydeps', 'B.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)
- 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._PYDEPS_FILES = self.old_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._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):
« no previous file with comments | « PRESUBMIT.py ('k') | PRESUBMIT_test_mocks.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698