tests/presubmit_unittest.py - Issue 7253015: Remove manual --tbr support and convert it into automatic TBR= detection.

Unified Diff: tests/presubmit_unittest.py

Issue 7253015: Remove manual --tbr support and convert it into automatic TBR= detection. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: removed tests/tbr.sh Created 9 years, 5 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

Index: tests/presubmit_unittest.py

diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py

index 7f87be4181e2145cc41012a2c578b741d1fc6329..40887d8aac6e4d07ec876bc41ffabc209e376fef 100755

--- a/tests/presubmit_unittest.py

+++ b/tests/presubmit_unittest.py

@@ -368,7 +368,7 @@ class PresubmitUnittest(PresubmitTestsBase):

None)

- executer = presubmit.PresubmitExecuter(change, False, False, None, False)

+ executer = presubmit.PresubmitExecuter(change, False, None, False)

self.failIf(executer.ExecPresubmitScript('', fake_presubmit))

# No error if no on-upload entry point

self.failIf(executer.ExecPresubmitScript(

@@ -377,7 +377,7 @@ class PresubmitUnittest(PresubmitTestsBase):

fake_presubmit

))

- executer = presubmit.PresubmitExecuter(change, True, False, None, False)

+ executer = presubmit.PresubmitExecuter(change, True, None, False)

# No error if no on-commit entry point

self.failIf(executer.ExecPresubmitScript(

('def CheckChangeOnUpload(input_api, output_api):\n'

@@ -447,7 +447,7 @@ class PresubmitUnittest(PresubmitTestsBase):

None)

output = presubmit.DoPresubmitChecks(

- change, False, True, None, input_buf, None, False, False, None)

+ change, False, True, None, input_buf, None, False, None)

self.failIf(output.should_continue())

self.assertEqual(output.getvalue().count('!!'), 2)

self.assertEqual(output.getvalue().count(

@@ -487,13 +487,13 @@ class PresubmitUnittest(PresubmitTestsBase):

None)

output = presubmit.DoPresubmitChecks(

- change, False, True, None, input_buf, None, True, False, None)

+ change, False, True, None, input_buf, None, True, None)

self.failIf(output.should_continue())

self.assertEqual(output.getvalue().count('??'), 2)

input_buf = StringIO.StringIO('y\n') # say yes to the warning

output = presubmit.DoPresubmitChecks(

- change, False, True, None, input_buf, None, True, False, None)

+ change, False, True, None, input_buf, None, True, None)

self.failUnless(output.should_continue())

self.assertEquals(output.getvalue().count('??'), 2)

self.assertEqual(output.getvalue().count(

@@ -532,7 +532,7 @@ class PresubmitUnittest(PresubmitTestsBase):

None)

output = presubmit.DoPresubmitChecks(change, False, True, None, None,

- None, False, False, None)

+ None, False, None)

self.assertEqual(output.getvalue().count('??'), 2)

self.assertEqual(output.getvalue().count('XX!!XX'), 2)

self.assertEqual(output.getvalue().count('(y/N)'), 0)

@@ -575,8 +575,7 @@ def CheckChangeOnCommit(input_api, output_api):

None)

output = presubmit.DoPresubmitChecks(

- change, False, True, None, input_buf, DEFAULT_SCRIPT, False, False,

- None)

+ change, False, True, None, input_buf, DEFAULT_SCRIPT, False, None)

self.failIf(output.should_continue())

text = ('Running presubmit upload checks ...\n'

'Warning, no presubmit.py found.\n'

@@ -656,8 +655,7 @@ def CheckChangeOnCommit(input_api, output_api):

None)

self.failUnless(presubmit.DoPresubmitChecks(

- change, False, True, output, input_buf, DEFAULT_SCRIPT, False, False,

- None))

+ change, False, True, output, input_buf, DEFAULT_SCRIPT, False, None))

self.assertEquals(output.getvalue(),

('Running presubmit upload checks ...\n'

'Warning, no presubmit.py found.\n'

@@ -755,7 +753,7 @@ def CheckChangeOnCommit(input_api, output_api):

presubmit.DoPresubmitChecks(mox.IgnoreArg(), False, False,

mox.IgnoreArg(),

- None, False, False, None).AndReturn(output)

+ None, False, None).AndReturn(output)

self.mox.ReplayAll()

self.assertEquals(

@@ -804,7 +802,7 @@ class InputApiUnittest(PresubmitTestsBase):

]

# If this test fails, you should add the relevant test.

self.compareMembers(

- presubmit.InputApi(self.fake_change, './.', False, False, None, False),

+ presubmit.InputApi(self.fake_change, './.', False, None, False),

members)

def testDepotToLocalPath(self):

@@ -814,11 +812,11 @@ class InputApiUnittest(PresubmitTestsBase):

self.mox.ReplayAll()

path = presubmit.InputApi(

- self.fake_change, './p', False, False, None, False).DepotToLocalPath(

+ self.fake_change, './p', False, None, False).DepotToLocalPath(

'svn://foo/smurf')

self.failUnless(path == 'prout')

path = presubmit.InputApi(

- self.fake_change, './p', False, False, None, False).DepotToLocalPath(

+ self.fake_change, './p', False, None, False).DepotToLocalPath(

'svn:/foo/notfound/burp')

self.failUnless(path == None)

@@ -827,11 +825,11 @@ class InputApiUnittest(PresubmitTestsBase):

presubmit.scm.SVN.CaptureInfo('notfound-food').AndReturn({})

self.mox.ReplayAll()

path = presubmit.InputApi(

- self.fake_change, './p', False, False, None, False).LocalToDepotPath(

+ self.fake_change, './p', False, None, False).LocalToDepotPath(

'smurf')

self.assertEqual(path, 'svn://foo')

path = presubmit.InputApi(

- self.fake_change, './p', False, False, None, False).LocalToDepotPath(

+ self.fake_change, './p', False, None, False).LocalToDepotPath(

'notfound-food')

self.assertEquals(path, None)

@@ -840,7 +838,7 @@ class InputApiUnittest(PresubmitTestsBase):

api = presubmit.InputApi(

self.fake_change,

presubmit_path='foo/path/PRESUBMIT.py',

- is_committing=False, tbr=False, rietveld_obj=None, verbose=False)

+ is_committing=False, rietveld_obj=None, verbose=False)

self.assertEquals(api.PresubmitLocalPath(), 'foo/path')

self.assertEquals(api.change, self.fake_change)

self.assertEquals(api.host_url, 'http://codereview.chromium.org')

@@ -905,7 +903,7 @@ class InputApiUnittest(PresubmitTestsBase):

input_api = presubmit.InputApi(

change,

join(self.fake_root_dir, 'foo', 'PRESUBMIT.py'),

- False, False, None, False)

+ False, None, False)

# Doesn't filter much

got_files = input_api.AffectedFiles()

self.assertEquals(len(got_files), 7)

@@ -991,8 +989,7 @@ class InputApiUnittest(PresubmitTestsBase):

]

input_api = presubmit.InputApi(

- self.fake_change, './PRESUBMIT.py', False,

- False, None, False)

+ self.fake_change, './PRESUBMIT.py', False, None, False)

self.mox.ReplayAll()

self.assertEqual(len(input_api.DEFAULT_WHITE_LIST), 21)

@@ -1023,7 +1020,7 @@ class InputApiUnittest(PresubmitTestsBase):

input_api = presubmit.InputApi(

change,

presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT.py'),

- False, False, None, False)

+ False, None, False)

got_files = input_api.AffectedSourceFiles(FilterSourceFile)

self.assertEquals(len(got_files), 2)

self.assertEquals(got_files[0].LocalPath(), 'eeaee')

@@ -1043,7 +1040,7 @@ class InputApiUnittest(PresubmitTestsBase):

change = presubmit.SvnChange(

'mychange', '', self.fake_root_dir, files, 0, 0, None)

input_api = presubmit.InputApi(

- change, './PRESUBMIT.py', False, False, None, False)

+ change, './PRESUBMIT.py', False, None, False)

# Sample usage of overiding the default white and black lists.

got_files = input_api.AffectedSourceFiles(

lambda x: input_api.FilterSourceFile(x, white_list, black_list))

@@ -1084,7 +1081,7 @@ class InputApiUnittest(PresubmitTestsBase):

presubmit_path = join(self.fake_root_dir, 'isdir', 'PRESUBMIT.py')

api = presubmit.InputApi(

change=change, presubmit_path=presubmit_path,

- is_committing=True, tbr=False, rietveld_obj=None, verbose=False)

+ is_committing=True, rietveld_obj=None, verbose=False)

paths_from_api = api.AbsoluteLocalPaths(include_dirs=True)

self.assertEqual(len(paths_from_api), 2)

for absolute_paths in [paths_from_change, paths_from_api]:

@@ -1102,7 +1099,7 @@ class InputApiUnittest(PresubmitTestsBase):

api = presubmit.InputApi(

change,

presubmit.os.path.join(self.fake_root_dir, 'foo', 'PRESUBMIT.py'), True,

- False, None, False)

+ None, False)

api.AffectedTextFiles(include_deletes=False)

def testReadFileStringDenied(self):

@@ -1112,7 +1109,7 @@ class InputApiUnittest(PresubmitTestsBase):

'foo', 'foo', self.fake_root_dir, [('M', 'AA')], 0, 0, None)

input_api = presubmit.InputApi(

change, presubmit.os.path.join(self.fake_root_dir, '/p'), False,

- False, None, False)

+ None, False)

self.assertRaises(IOError, input_api.ReadFile, 'boo', 'x')

def testReadFileStringAccepted(self):

@@ -1124,7 +1121,7 @@ class InputApiUnittest(PresubmitTestsBase):

'foo', 'foo', self.fake_root_dir, [('M', 'AA')], 0, 0, None)

input_api = presubmit.InputApi(

change, presubmit.os.path.join(self.fake_root_dir, '/p'), False,

- False, None, False)

+ None, False)

input_api.ReadFile(path, 'x')

def testReadFileAffectedFileDenied(self):

@@ -1135,7 +1132,7 @@ class InputApiUnittest(PresubmitTestsBase):

'foo', 'foo', self.fake_root_dir, [('M', 'AA')], 0, 0, None)

input_api = presubmit.InputApi(

change, presubmit.os.path.join(self.fake_root_dir, '/p'), False,

- False, None, False)

+ None, False)

self.assertRaises(IOError, input_api.ReadFile, fileobj, 'x')

def testReadFileAffectedFileAccepted(self):

@@ -1148,7 +1145,7 @@ class InputApiUnittest(PresubmitTestsBase):

'foo', 'foo', self.fake_root_dir, [('M', 'AA')], 0, 0, None)

input_api = presubmit.InputApi(

change, presubmit.os.path.join(self.fake_root_dir, '/p'), False,

- False, None, False)

+ None, False)

input_api.ReadFile(fileobj, 'x')

@@ -1379,6 +1376,7 @@ class CannedChecksUnittest(PresubmitTestsBase):

'CheckChangeHasTestField',

'CheckChangeLintsClean',

'CheckChangeSvnEolStyle',

+ 'CheckChangeWasUploaded',

'CheckDoNotSubmit',

'CheckDoNotSubmitInDescription', 'CheckDoNotSubmitInFiles',

'CheckLongLines', 'CheckTreeIsOpen', 'PanProjectChecks',

« presubmit_canned_checks.py ('K') | « tests/post-dcommit-hook-test.sh ('k') | tests/tbr.sh » ('j') | no next file with comments »