aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor DoPresubmitChecks unit tests.

Browse Source 
Purpose: This is a unit test method refactoring to try to
improve readability; I made this when adding unit tests for
https://chromium-review.googlesource.com/c/419148/.

In this CL:
 - Extract ExampleChange helper method
 - Explicitly write names of args for DoPresubmitChecks
 - Other minor changes to make the style more consistent

Change-Id: I52236e285e50db890245c6c4b69c70ddf258f140
Reviewed-on: https://chromium-review.googlesource.com/419184
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
changes/84/419184/4
Quinten Yearsley 9 years ago committed by Commit Bot
parent b5effa1f24
commit ee60c539eb
1 changed files with 181 additions and 189 deletions
Show Stats Download Patch File Download Diff File

370
tests/presubmit_unittest.py
Unescape Escape View File

@ -194,98 +194,106 @@ class PresubmitUnittest(PresubmitTestsBase):
self.assertEqual(canned.CheckOwners, orig) self.assertEqual(canned.CheckOwners, orig)
def testListRelevantPresubmitFiles(self): def testListRelevantPresubmitFiles(self):
join = presubmit.os.path.join
files = [ files = [
'blat.cc', 'blat.cc',
join('foo', 'haspresubmit', 'yodle', 'smart.h'), presubmit.os.path.join('foo', 'haspresubmit', 'yodle', 'smart.h'),
join('moo', 'mat', 'gat', 'yo.h'), presubmit.os.path.join('moo', 'mat', 'gat', 'yo.h'),
join('foo', 'luck.h'), presubmit.os.path.join('foo', 'luck.h'),
] ]
inherit_path = presubmit.os.path.join(self.fake_root_dir, inherit_path = presubmit.os.path.join(self.fake_root_dir,
self._INHERIT_SETTINGS) self._INHERIT_SETTINGS)
presubmit.os.path.isfile(inherit_path).AndReturn(False) presubmit.os.path.isfile(inherit_path).AndReturn(False)
presubmit.os.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py']) presubmit.os.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
presubmit.os.path.isfile(join(self.fake_root_dir, presubmit.os.path.isfile(presubmit.os.path.join(self.fake_root_dir,
'PRESUBMIT.py')).AndReturn(True) 'PRESUBMIT.py')).AndReturn(True)
presubmit.os.listdir(join(self.fake_root_dir, 'foo')).AndReturn([]) presubmit.os.listdir(presubmit.os.path.join(
presubmit.os.listdir(join(self.fake_root_dir, 'foo', self.fake_root_dir, 'foo')).AndReturn([])
presubmit.os.listdir(presubmit.os.path.join(self.fake_root_dir, 'foo',
'haspresubmit')).AndReturn(['PRESUBMIT.py']) 'haspresubmit')).AndReturn(['PRESUBMIT.py'])
presubmit.os.path.isfile( presubmit.os.path.isfile(
join(self.fake_root_dir, 'foo', 'haspresubmit', presubmit.os.path.join(self.fake_root_dir, 'foo', 'haspresubmit',
'PRESUBMIT.py')).AndReturn(True) 'PRESUBMIT.py')).AndReturn(True)
presubmit.os.listdir( presubmit.os.listdir(
join(self.fake_root_dir, 'foo', 'haspresubmit', 'yodle')).AndReturn( presubmit.os.path.join(
self.fake_root_dir, 'foo', 'haspresubmit', 'yodle')).AndReturn(
['PRESUBMIT.py']) ['PRESUBMIT.py'])
presubmit.os.path.isfile( presubmit.os.path.isfile(
join(self.fake_root_dir, 'foo', 'haspresubmit', 'yodle', presubmit.os.path.join(
'PRESUBMIT.py')).AndReturn(True) self.fake_root_dir, 'foo', 'haspresubmit', 'yodle',
presubmit.os.listdir(join(self.fake_root_dir, 'moo')).AndReturn([]) 'PRESUBMIT.py')).AndReturn(True)
presubmit.os.listdir(join(self.fake_root_dir, 'moo', 'mat')).AndReturn([]) presubmit.os.listdir(presubmit.os.path.join(
presubmit.os.listdir(join(self.fake_root_dir, 'moo', 'mat', self.fake_root_dir, 'moo')).AndReturn([])
'gat')).AndReturn([]) presubmit.os.listdir(presubmit.os.path.join(
self.fake_root_dir, 'moo', 'mat')).AndReturn([])
presubmit.os.listdir(presubmit.os.path.join(
self.fake_root_dir, 'moo', 'mat', 'gat')).AndReturn([])
self.mox.ReplayAll() self.mox.ReplayAll()
presubmit_files = presubmit.ListRelevantPresubmitFiles(files, presubmit_files = presubmit.ListRelevantPresubmitFiles(files,
self.fake_root_dir) self.fake_root_dir)
self.assertEqual(presubmit_files, self.assertEqual(presubmit_files,
[ [
join(self.fake_root_dir, 'PRESUBMIT.py'), presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT.py'),
join(self.fake_root_dir, 'foo', 'haspresubmit', 'PRESUBMIT.py'), presubmit.os.path.join(
join(self.fake_root_dir, 'foo', 'haspresubmit', 'yodle', self.fake_root_dir, 'foo', 'haspresubmit', 'PRESUBMIT.py'),
'PRESUBMIT.py') presubmit.os.path.join(
self.fake_root_dir, 'foo', 'haspresubmit', 'yodle',
'PRESUBMIT.py')
]) ])
def testListUserPresubmitFiles(self): def testListUserPresubmitFiles(self):
join = presubmit.os.path.join
files = ['blat.cc',] files = ['blat.cc',]
inherit_path = presubmit.os.path.join(self.fake_root_dir, inherit_path = presubmit.os.path.join(self.fake_root_dir,
self._INHERIT_SETTINGS) self._INHERIT_SETTINGS)
presubmit.os.path.isfile(inherit_path).AndReturn(False) presubmit.os.path.isfile(inherit_path).AndReturn(False)
presubmit.os.listdir(self.fake_root_dir).AndReturn( presubmit.os.listdir(self.fake_root_dir).AndReturn(
['PRESUBMIT.py', 'PRESUBMIT_test.py', 'PRESUBMIT-user.py']) ['PRESUBMIT.py', 'PRESUBMIT_test.py', 'PRESUBMIT-user.py'])
presubmit.os.path.isfile(join(self.fake_root_dir, presubmit.os.path.isfile(presubmit.os.path.join(self.fake_root_dir,
'PRESUBMIT.py')).AndReturn(True) 'PRESUBMIT.py')).AndReturn(True)
presubmit.os.path.isfile(join(self.fake_root_dir, presubmit.os.path.isfile(presubmit.os.path.join(self.fake_root_dir,
'PRESUBMIT_test.py')).AndReturn(True) 'PRESUBMIT_test.py')).AndReturn(True)
presubmit.os.path.isfile(join(self.fake_root_dir, presubmit.os.path.isfile(presubmit.os.path.join(self.fake_root_dir,
'PRESUBMIT-user.py')).AndReturn(True) 'PRESUBMIT-user.py')).AndReturn(True)
self.mox.ReplayAll() self.mox.ReplayAll()
presubmit_files = presubmit.ListRelevantPresubmitFiles(files, presubmit_files = presubmit.ListRelevantPresubmitFiles(files,
self.fake_root_dir) self.fake_root_dir)
self.assertEqual(presubmit_files, [ self.assertEqual(presubmit_files, [
join(self.fake_root_dir, 'PRESUBMIT.py'), presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT.py'),
join(self.fake_root_dir, 'PRESUBMIT-user.py'), presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT-user.py'),
]) ])
def testListRelevantPresubmitFilesInheritSettings(self): def testListRelevantPresubmitFilesInheritSettings(self):
join = presubmit.os.path.join
sys_root_dir = self._OS_SEP sys_root_dir = self._OS_SEP
root_dir = join(sys_root_dir, 'foo', 'bar') root_dir = presubmit.os.path.join(sys_root_dir, 'foo', 'bar')
files = [ files = [
'test.cc', 'test.cc',
join('moo', 'test2.cc'), presubmit.os.path.join('moo', 'test2.cc'),
join('zoo', 'test3.cc') presubmit.os.path.join('zoo', 'test3.cc')
] ]
inherit_path = presubmit.os.path.join(root_dir, self._INHERIT_SETTINGS) inherit_path = presubmit.os.path.join(root_dir, self._INHERIT_SETTINGS)
presubmit.os.path.isfile(inherit_path).AndReturn(True) presubmit.os.path.isfile(inherit_path).AndReturn(True)
presubmit.os.listdir(sys_root_dir).AndReturn([]) presubmit.os.listdir(sys_root_dir).AndReturn([])
presubmit.os.listdir(join(sys_root_dir, 'foo')).AndReturn(['PRESUBMIT.py']) presubmit.os.listdir(presubmit.os.path.join(
presubmit.os.path.isfile(join(sys_root_dir, 'foo', sys_root_dir, 'foo')).AndReturn(['PRESUBMIT.py'])
'PRESUBMIT.py')).AndReturn(True) presubmit.os.path.isfile(presubmit.os.path.join(
presubmit.os.listdir(join(sys_root_dir, 'foo', 'bar')).AndReturn([]) sys_root_dir, 'foo', 'PRESUBMIT.py')).AndReturn(True)
presubmit.os.listdir(join(sys_root_dir, 'foo', 'bar', 'moo')).AndReturn( presubmit.os.listdir(presubmit.os.path.join(
['PRESUBMIT.py']) sys_root_dir, 'foo', 'bar')).AndReturn([])
presubmit.os.path.isfile( presubmit.os.listdir(presubmit.os.path.join(
join(sys_root_dir, 'foo', 'bar', 'moo', 'PRESUBMIT.py')).AndReturn(True) sys_root_dir, 'foo', 'bar', 'moo')).AndReturn(['PRESUBMIT.py'])
presubmit.os.listdir(join(sys_root_dir, 'foo', 'bar', 'zoo')).AndReturn([]) presubmit.os.path.isfile(presubmit.os.path.join(
sys_root_dir, 'foo', 'bar', 'moo', 'PRESUBMIT.py')).AndReturn(True)
presubmit.os.listdir(presubmit.os.path.join(
sys_root_dir, 'foo', 'bar', 'zoo')).AndReturn([])
self.mox.ReplayAll() self.mox.ReplayAll()
presubmit_files = presubmit.ListRelevantPresubmitFiles(files, root_dir) presubmit_files = presubmit.ListRelevantPresubmitFiles(files, root_dir)
self.assertEqual(presubmit_files, self.assertEqual(presubmit_files,
[ [
join(sys_root_dir, 'foo', 'PRESUBMIT.py'), presubmit.os.path.join(sys_root_dir, 'foo', 'PRESUBMIT.py'),
join(sys_root_dir, 'foo', 'bar', 'moo', 'PRESUBMIT.py') presubmit.os.path.join(
sys_root_dir, 'foo', 'bar', 'moo', 'PRESUBMIT.py')
]) ])
def testTagLineRe(self): def testTagLineRe(self):
@ -554,114 +562,89 @@ class PresubmitUnittest(PresubmitTestsBase):
fake_presubmit) fake_presubmit)
def testDoPresubmitChecks(self): def testDoPresubmitChecks(self):
join = presubmit.os.path.join haspresubmit_path = presubmit.os.path.join(
description_lines = ('Hello there', self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
'this is a change', root_path = presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT.py')
'STORY=http://tracker/123') inherit_path = presubmit.os.path.join(
files = [ self.fake_root_dir, self._INHERIT_SETTINGS)
['A', join('haspresubmit', 'blat.cc')],
]
haspresubmit_path = join(self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
root_path = join(self.fake_root_dir, 'PRESUBMIT.py')
inherit_path = presubmit.os.path.join(self.fake_root_dir,
self._INHERIT_SETTINGS)
presubmit.os.path.isfile(inherit_path).AndReturn(False) presubmit.os.path.isfile(inherit_path).AndReturn(False)
presubmit.os.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py']) presubmit.os.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
presubmit.os.path.isfile(root_path).AndReturn(True) presubmit.os.path.isfile(root_path).AndReturn(True)
presubmit.os.listdir(os.path.join( presubmit.os.listdir(os.path.join(
self.fake_root_dir, 'haspresubmit')).AndReturn(['PRESUBMIT.py']) self.fake_root_dir, 'haspresubmit')).AndReturn(['PRESUBMIT.py'])
presubmit.os.path.isfile(haspresubmit_path).AndReturn(True) presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
presubmit.gclient_utils.FileRead(root_path, presubmit.gclient_utils.FileRead(root_path, 'rU').AndReturn(
'rU').AndReturn(self.presubmit_text) self.presubmit_text)
presubmit.gclient_utils.FileRead(haspresubmit_path, presubmit.gclient_utils.FileRead(haspresubmit_path, 'rU').AndReturn(
'rU').AndReturn(self.presubmit_text) self.presubmit_text)
presubmit.random.randint(0, 4).AndReturn(1) presubmit.random.randint(0, 4).AndReturn(1)
self.mox.ReplayAll() self.mox.ReplayAll()
input_buf = StringIO.StringIO('y\n') # Make a change which will have no warnings.
change = presubmit.Change( change = self.ExampleChange(extra_lines=['STORY=http://tracker/123'])
'mychange',
'\n'.join(description_lines),
self.fake_root_dir,
files,
0,
0,
None)
output = presubmit.DoPresubmitChecks( output = presubmit.DoPresubmitChecks(
change, False, True, None, input_buf, None, False, None) change=change, committing=False, verbose=True,
output_stream=None, input_stream=None,
default_presubmit=None, may_prompt=False, rietveld_obj=None)
self.failIf(output.should_continue()) self.failIf(output.should_continue())
self.assertEqual(output.getvalue().count('!!'), 2) self.assertEqual(output.getvalue().count('!!'), 2)
self.assertEqual(output.getvalue().count( self.assertEqual(output.getvalue().count(
'Running presubmit upload checks ...\n'), 1) 'Running presubmit upload checks ...\n'), 1)
def testDoPresubmitChecksPromptsAfterWarnings(self): def testDoPresubmitChecksPromptsAfterWarnings(self):
join = presubmit.os.path.join presubmit_path = presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT.py')
description_lines = ('Hello there', haspresubmit_path = presubmit.os.path.join(
'this is a change', self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
'NOSUCHKEY=http://tracker/123') inherit_path = presubmit.os.path.join(
files = [ self.fake_root_dir, self._INHERIT_SETTINGS)
['A', join('haspresubmit', 'blat.cc')],
]
presubmit_path = join(self.fake_root_dir, 'PRESUBMIT.py')
haspresubmit_path = join(self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
inherit_path = presubmit.os.path.join(self.fake_root_dir,
self._INHERIT_SETTINGS)
for _ in range(2): for _ in range(2):
presubmit.os.path.isfile(inherit_path).AndReturn(False) presubmit.os.path.isfile(inherit_path).AndReturn(False)
presubmit.os.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py']) presubmit.os.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
presubmit.os.path.isfile(presubmit_path).AndReturn(True) presubmit.os.path.isfile(presubmit_path).AndReturn(True)
presubmit.os.listdir(join(self.fake_root_dir, 'haspresubmit')).AndReturn( presubmit.os.listdir(presubmit.os.path.join(
['PRESUBMIT.py']) self.fake_root_dir, 'haspresubmit')).AndReturn(['PRESUBMIT.py'])
presubmit.os.path.isfile(haspresubmit_path).AndReturn(True) presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
presubmit.gclient_utils.FileRead(presubmit_path, 'rU' presubmit.gclient_utils.FileRead(presubmit_path, 'rU').AndReturn(
).AndReturn(self.presubmit_text) self.presubmit_text)
presubmit.gclient_utils.FileRead(haspresubmit_path, 'rU' presubmit.gclient_utils.FileRead(haspresubmit_path, 'rU').AndReturn(
).AndReturn(self.presubmit_text) self.presubmit_text)
presubmit.random.randint(0, 4).AndReturn(1) presubmit.random.randint(0, 4).AndReturn(1)
presubmit.random.randint(0, 4).AndReturn(1) presubmit.random.randint(0, 4).AndReturn(1)
self.mox.ReplayAll() self.mox.ReplayAll()
# Make a change with a single warning.
change = self.ExampleChange(extra_lines=['NOSUCHKEY=http://tracker/123'])
input_buf = StringIO.StringIO('n\n') # say no to the warning input_buf = StringIO.StringIO('n\n') # say no to the warning
change = presubmit.Change(
'mychange',
'\n'.join(description_lines),
self.fake_root_dir,
files,
0,
0,
None)
output = presubmit.DoPresubmitChecks( output = presubmit.DoPresubmitChecks(
change, False, True, None, input_buf, None, True, None) change=change, committing=False, verbose=True,
output_stream=None, input_stream=input_buf,
default_presubmit=None, may_prompt=True, rietveld_obj=None)
self.failIf(output.should_continue()) self.failIf(output.should_continue())
self.assertEqual(output.getvalue().count('??'), 2) self.assertEqual(output.getvalue().count('??'), 2)
input_buf = StringIO.StringIO('y\n') # say yes to the warning input_buf = StringIO.StringIO('y\n') # say yes to the warning
output = presubmit.DoPresubmitChecks( output = presubmit.DoPresubmitChecks(
change, False, True, None, input_buf, None, True, None) change=change, committing=False, verbose=True,
output_stream=None, input_stream=input_buf,
default_presubmit=None, may_prompt=True, rietveld_obj=None)
self.failUnless(output.should_continue()) self.failUnless(output.should_continue())
self.assertEquals(output.getvalue().count('??'), 2) self.assertEquals(output.getvalue().count('??'), 2)
self.assertEqual(output.getvalue().count( self.assertEqual(output.getvalue().count(
'Running presubmit upload checks ...\n'), 1) 'Running presubmit upload checks ...\n'), 1)
def testDoPresubmitChecksNoWarningPromptIfErrors(self): def testDoPresubmitChecksNoWarningPromptIfErrors(self):
join = presubmit.os.path.join presubmit_path = presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT.py')
description_lines = ('Hello there', haspresubmit_path = presubmit.os.path.join(
'this is a change', self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
'NOSUCHKEY=http://tracker/123', inherit_path = presubmit.os.path.join(
'REALLYNOSUCHKEY=http://tracker/123') self.fake_root_dir, self._INHERIT_SETTINGS)
files = [
['A', join('haspresubmit', 'blat.cc')],
]
presubmit_path = join(self.fake_root_dir, 'PRESUBMIT.py')
haspresubmit_path = join(self.fake_root_dir, 'haspresubmit',
'PRESUBMIT.py')
inherit_path = presubmit.os.path.join(self.fake_root_dir,
self._INHERIT_SETTINGS)
presubmit.os.path.isfile(inherit_path).AndReturn(False) presubmit.os.path.isfile(inherit_path).AndReturn(False)
presubmit.os.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py']) presubmit.os.listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
presubmit.os.path.isfile(presubmit_path).AndReturn(True) presubmit.os.path.isfile(presubmit_path).AndReturn(True)
presubmit.os.listdir(join(self.fake_root_dir, 'haspresubmit')).AndReturn( presubmit.os.listdir(presubmit.os.path.join(
['PRESUBMIT.py']) self.fake_root_dir, 'haspresubmit')).AndReturn(['PRESUBMIT.py'])
presubmit.os.path.isfile(haspresubmit_path).AndReturn(True) presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
presubmit.gclient_utils.FileRead(presubmit_path, 'rU' presubmit.gclient_utils.FileRead(presubmit_path, 'rU'
).AndReturn(self.presubmit_text) ).AndReturn(self.presubmit_text)
@ -670,16 +653,14 @@ class PresubmitUnittest(PresubmitTestsBase):
presubmit.random.randint(0, 4).AndReturn(1) presubmit.random.randint(0, 4).AndReturn(1)
self.mox.ReplayAll() self.mox.ReplayAll()
change = presubmit.Change( change = self.ExampleChange(extra_lines=[
'mychange', 'NOSUCHKEY=http://tracker/123',
'\n'.join(description_lines), 'REALLYNOSUCHKEY=http://tracker/123'
self.fake_root_dir, ])
files, output = presubmit.DoPresubmitChecks(
0, change=change, committing=False, verbose=True,
0, output_stream=None, input_stream=None,
None) default_presubmit=None, may_prompt=False, rietveld_obj=None)
output = presubmit.DoPresubmitChecks(change, False, True, None, None,
None, False, None)
self.assertEqual(output.getvalue().count('??'), 2) self.assertEqual(output.getvalue().count('??'), 2)
self.assertEqual(output.getvalue().count('XX!!XX'), 2) self.assertEqual(output.getvalue().count('XX!!XX'), 2)
self.assertEqual(output.getvalue().count('(y/N)'), 0) self.assertEqual(output.getvalue().count('(y/N)'), 0)
@ -687,45 +668,32 @@ class PresubmitUnittest(PresubmitTestsBase):
'Running presubmit upload checks ...\n'), 1) 'Running presubmit upload checks ...\n'), 1)
def testDoDefaultPresubmitChecksAndFeedback(self): def testDoDefaultPresubmitChecksAndFeedback(self):
join = presubmit.os.path.join always_fail_presubmit_script = """
description_lines = ('Hello there',
'this is a change',
'STORY=http://tracker/123')
files = [
['A', join('haspresubmit', 'blat.cc')],
]
DEFAULT_SCRIPT = """
def CheckChangeOnUpload(input_api, output_api): def CheckChangeOnUpload(input_api, output_api):
return [output_api.PresubmitError("!!")] return [output_api.PresubmitError("!!")]
def CheckChangeOnCommit(input_api, output_api): def CheckChangeOnCommit(input_api, output_api):
raise Exception("Test error") raise Exception("Test error")
""" """
inherit_path = presubmit.os.path.join(self.fake_root_dir, inherit_path = presubmit.os.path.join(
self._INHERIT_SETTINGS) self.fake_root_dir, self._INHERIT_SETTINGS)
presubmit.os.path.isfile(inherit_path).AndReturn(False) presubmit.os.path.isfile(inherit_path).AndReturn(False)
presubmit.os.listdir(join(self.fake_root_dir) presubmit.os.listdir(self.fake_root_dir).AndReturn([])
).AndReturn([]) presubmit.os.listdir(presubmit.os.path.join(
presubmit.os.listdir(join(self.fake_root_dir, 'haspresubmit') self.fake_root_dir, 'haspresubmit')).AndReturn(['PRESUBMIT.py'])
).AndReturn(['PRESUBMIT.py']) presubmit.os.path.isfile(presubmit.os.path.join(self.fake_root_dir,
presubmit.os.path.isfile(join(self.fake_root_dir,
'haspresubmit', 'haspresubmit',
'PRESUBMIT.py')).AndReturn(False) 'PRESUBMIT.py')).AndReturn(False)
presubmit.random.randint(0, 4).AndReturn(0) presubmit.random.randint(0, 4).AndReturn(0)
self.mox.ReplayAll() self.mox.ReplayAll()
input_buf = StringIO.StringIO('y\n') input_buf = StringIO.StringIO('y\n')
# Always fail.
change = presubmit.Change( change = self.ExampleChange(extra_lines=['STORY=http://tracker/123'])
'mychange',
'\n'.join(description_lines),
self.fake_root_dir,
files,
0,
0,
None)
output = presubmit.DoPresubmitChecks( output = presubmit.DoPresubmitChecks(
change, False, True, None, input_buf, DEFAULT_SCRIPT, False, None, None, change=change, committing=False, verbose=True,
None) output_stream=None, input_stream=input_buf,
default_presubmit=always_fail_presubmit_script,
may_prompt=False, rietveld_obj=None)
self.failIf(output.should_continue()) self.failIf(output.should_continue())
text = ( text = (
'Running presubmit upload checks ...\n' 'Running presubmit upload checks ...\n'
@ -738,8 +706,8 @@ def CheckChangeOnCommit(input_api, output_api):
'on the file to figure out who to ask for help.\n') 'on the file to figure out who to ask for help.\n')
self.assertEquals(output.getvalue(), text) self.assertEquals(output.getvalue(), text)
def testTags(self): def testDoPresubmitChecksWithTags(self):
DEFAULT_SCRIPT = """ tag_checker_presubmit_script = """
def CheckChangeOnUpload(input_api, output_api): def CheckChangeOnUpload(input_api, output_api):
if input_api.change.tags['BUG'] != 'boo': if input_api.change.tags['BUG'] != 'boo':
return [output_api.PresubmitError('Tag parsing failed. 1')] return [output_api.PresubmitError('Tag parsing failed. 1')]
@ -770,12 +738,12 @@ def CheckChangeOnCommit(input_api, output_api):
raise Exception("Test error") raise Exception("Test error")
""" """
presubmit.random.randint(0, 4).AndReturn(1) presubmit.random.randint(0, 4).AndReturn(1)
inherit_path = presubmit.os.path.join(self.fake_root_dir, inherit_path = presubmit.os.path.join(
self._INHERIT_SETTINGS) self.fake_root_dir, self._INHERIT_SETTINGS)
presubmit.os.path.isfile(inherit_path).AndReturn(False) presubmit.os.path.isfile(inherit_path).AndReturn(False)
self.mox.ReplayAll() self.mox.ReplayAll()
output = StringIO.StringIO() output_buf = StringIO.StringIO()
input_buf = StringIO.StringIO('y\n') input_buf = StringIO.StringIO('y\n')
change = presubmit.Change( change = presubmit.Change(
'foo', 'foo',
@ -785,10 +753,14 @@ def CheckChangeOnCommit(input_api, output_api):
0, 0,
0, 0,
None) None)
self.failUnless(presubmit.DoPresubmitChecks( presubmit_output = presubmit.DoPresubmitChecks(
change, False, True, output, input_buf, DEFAULT_SCRIPT, False, None, change=change, committing=False, verbose=True,
None)) output_stream=output_buf, input_stream=input_buf,
self.assertEquals(output.getvalue(), default_presubmit=tag_checker_presubmit_script,
may_prompt=False, rietveld_obj=None)
self.failUnless(presubmit_output)
self.assertEquals(output_buf.getvalue(),
('Running presubmit upload checks ...\n' ('Running presubmit upload checks ...\n'
'Warning, no PRESUBMIT.py found.\n' 'Warning, no PRESUBMIT.py found.\n'
'Running default presubmit script.\n' 'Running default presubmit script.\n'
@ -800,14 +772,8 @@ def CheckChangeOnCommit(input_api, output_api):
def testGetTryMastersExecuter(self): def testGetTryMastersExecuter(self):
self.mox.ReplayAll() self.mox.ReplayAll()
change = presubmit.Change( change = self.ExampleChange(
'foo', extra_lines=['STORY=http://tracker.com/42', 'BUG=boo\n'])
'Blah Blah\n\nSTORY=http://tracker.com/42\nBUG=boo\n',
self.fake_root_dir,
None,
0,
0,
None)
executer = presubmit.GetTryMastersExecuter() executer = presubmit.GetTryMastersExecuter()
self.assertEqual({}, executer.ExecPresubmitScript('', '', '', change)) self.assertEqual({}, executer.ExecPresubmitScript('', '', '', change))
self.assertEqual({}, self.assertEqual({},
@ -826,6 +792,24 @@ def CheckChangeOnCommit(input_api, output_api):
executer.ExecPresubmitScript( executer.ExecPresubmitScript(
self.presubmit_trymaster % result, '', '', change)) self.presubmit_trymaster % result, '', '', change))
def ExampleChange(self, extra_lines=None):
"""Returns an example Change instance for tests."""
description_lines = [
'Hello there',
'This is a change',
] + (extra_lines or [])
files = [
['A', presubmit.os.path.join('haspresubmit', 'blat.cc')],
]
return presubmit.Change(
name='mychange',
description='\n'.join(description_lines),
local_root=self.fake_root_dir,
files=files,
issue=0,
patchset=0,
author=None)
def testMergeMasters(self): def testMergeMasters(self):
merge = presubmit._MergeMasters merge = presubmit._MergeMasters
self.assertEqual({}, merge({}, {})) self.assertEqual({}, merge({}, {}))
@ -856,15 +840,16 @@ def CheckChangeOnCommit(input_api, output_api):
% ('{"t1.cr": {"linux1": set(["t1"])},' % ('{"t1.cr": {"linux1": set(["t1"])},'
' "t2.cr": {"linux2": set(["defaulttests"])}}')) ' "t2.cr": {"linux2": set(["defaulttests"])}}'))
join = presubmit.os.path.join
isfile = presubmit.os.path.isfile isfile = presubmit.os.path.isfile
listdir = presubmit.os.listdir listdir = presubmit.os.listdir
FileRead = presubmit.gclient_utils.FileRead FileRead = presubmit.gclient_utils.FileRead
filename = 'foo.cc' filename = 'foo.cc'
filename_linux = join('linux_only', 'penguin.cc') filename_linux = presubmit.os.path.join('linux_only', 'penguin.cc')
root_presubmit = join(self.fake_root_dir, 'PRESUBMIT.py') root_presubmit = presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT.py')
linux_presubmit = join(self.fake_root_dir, 'linux_only', 'PRESUBMIT.py') linux_presubmit = presubmit.os.path.join(
inherit_path = join(self.fake_root_dir, self._INHERIT_SETTINGS) self.fake_root_dir, 'linux_only', 'PRESUBMIT.py')
inherit_path = presubmit.os.path.join(
self.fake_root_dir, self._INHERIT_SETTINGS)
isfile(inherit_path).AndReturn(False) isfile(inherit_path).AndReturn(False)
listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py']) listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
@ -874,7 +859,8 @@ def CheckChangeOnCommit(input_api, output_api):
isfile(inherit_path).AndReturn(False) isfile(inherit_path).AndReturn(False)
listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py']) listdir(self.fake_root_dir).AndReturn(['PRESUBMIT.py'])
isfile(root_presubmit).AndReturn(True) isfile(root_presubmit).AndReturn(True)
listdir(join(self.fake_root_dir, 'linux_only')).AndReturn(['PRESUBMIT.py']) listdir(presubmit.os.path.join(
self.fake_root_dir, 'linux_only')).AndReturn(['PRESUBMIT.py'])
isfile(linux_presubmit).AndReturn(True) isfile(linux_presubmit).AndReturn(True)
FileRead(root_presubmit, 'rU').AndReturn(root_text) FileRead(root_presubmit, 'rU').AndReturn(root_text)
FileRead(linux_presubmit, 'rU').AndReturn(linux_text) FileRead(linux_presubmit, 'rU').AndReturn(linux_text)
@ -1015,22 +1001,21 @@ class InputApiUnittest(PresubmitTestsBase):
self.assertEquals(api.host_url, 'http://codereview.chromium.org') self.assertEquals(api.host_url, 'http://codereview.chromium.org')
def testInputApiPresubmitScriptFiltering(self): def testInputApiPresubmitScriptFiltering(self):
join = presubmit.os.path.join
description_lines = ('Hello there', description_lines = ('Hello there',
'this is a change', 'this is a change',
'BUG=123', 'BUG=123',
' STORY =http://foo/ \t', ' STORY =http://foo/ \t',
'and some more regular text') 'and some more regular text')
files = [ files = [
['A', join('foo', 'blat.cc'), True], ['A', presubmit.os.path.join('foo', 'blat.cc'), True],
['M', join('foo', 'blat', 'READ_ME2'), True], ['M', presubmit.os.path.join('foo', 'blat', 'READ_ME2'), True],
['M', join('foo', 'blat', 'binary.dll'), True], ['M', presubmit.os.path.join('foo', 'blat', 'binary.dll'), True],
['M', join('foo', 'blat', 'weird.xyz'), True], ['M', presubmit.os.path.join('foo', 'blat', 'weird.xyz'), True],
['M', join('foo', 'blat', 'another.h'), True], ['M', presubmit.os.path.join('foo', 'blat', 'another.h'), True],
['M', join('foo', 'third_party', 'third.cc'), True], ['M', presubmit.os.path.join('foo', 'third_party', 'third.cc'), True],
['D', join('foo', 'mat', 'beingdeleted.txt'), False], ['D', presubmit.os.path.join('foo', 'mat', 'beingdeleted.txt'), False],
['M', join('flop', 'notfound.txt'), False], ['M', presubmit.os.path.join('flop', 'notfound.txt'), False],
['A', join('boo', 'flap.h'), True], ['A', presubmit.os.path.join('boo', 'flap.h'), True],
] ]
diffs = [] diffs = []
for _, f, exists in files: for _, f, exists in files:
@ -1054,7 +1039,7 @@ class InputApiUnittest(PresubmitTestsBase):
None) None)
input_api = presubmit.InputApi( input_api = presubmit.InputApi(
change, change,
join(self.fake_root_dir, 'foo', 'PRESUBMIT.py'), presubmit.os.path.join(self.fake_root_dir, 'foo', 'PRESUBMIT.py'),
False, None, False) False, None, False)
# Doesn't filter much # Doesn't filter much
got_files = input_api.AffectedFiles() got_files = input_api.AffectedFiles()
@ -1210,7 +1195,6 @@ class InputApiUnittest(PresubmitTestsBase):
self.assertEquals(got_files[1].LocalPath(), 'eecaee') self.assertEquals(got_files[1].LocalPath(), 'eecaee')
def testGetAbsoluteLocalPath(self): def testGetAbsoluteLocalPath(self):
join = presubmit.os.path.join
normpath = presubmit.normpath normpath = presubmit.normpath
# Regression test for bug of presubmit stuff that relies on invoking # Regression test for bug of presubmit stuff that relies on invoking
# SVN (e.g. to get mime type of file) not working unless gcl invoked # SVN (e.g. to get mime type of file) not working unless gcl invoked
@ -1219,8 +1203,8 @@ class InputApiUnittest(PresubmitTestsBase):
# the presubmit script was asking about). # the presubmit script was asking about).
files = [ files = [
['A', 'isdir'], ['A', 'isdir'],
['A', join('isdir', 'blat.cc')], ['A', presubmit.os.path.join('isdir', 'blat.cc')],
['M', join('elsewhere', 'ouf.cc')], ['M', presubmit.os.path.join('elsewhere', 'ouf.cc')],
] ]
self.mox.ReplayAll() self.mox.ReplayAll()
@ -1231,25 +1215,33 @@ class InputApiUnittest(PresubmitTestsBase):
self.assertEquals(affected_files[0].LocalPath(), normpath('isdir')) self.assertEquals(affected_files[0].LocalPath(), normpath('isdir'))
self.assertEquals(affected_files[1].LocalPath(), normpath('isdir/blat.cc')) self.assertEquals(affected_files[1].LocalPath(), normpath('isdir/blat.cc'))
# Absolute paths should be prefixed # Absolute paths should be prefixed
self.assertEquals(affected_files[0].AbsoluteLocalPath(), self.assertEquals(
normpath(join(self.fake_root_dir, 'isdir'))) affected_files[0].AbsoluteLocalPath(),
self.assertEquals(affected_files[1].AbsoluteLocalPath(), presubmit.normpath(presubmit.os.path.join(self.fake_root_dir, 'isdir')))
normpath(join(self.fake_root_dir, 'isdir/blat.cc'))) self.assertEquals(
affected_files[1].AbsoluteLocalPath(),
presubmit.normpath(presubmit.os.path.join(
self.fake_root_dir, 'isdir/blat.cc')))
# New helper functions need to work # New helper functions need to work
paths_from_change = change.AbsoluteLocalPaths() paths_from_change = change.AbsoluteLocalPaths()
self.assertEqual(len(paths_from_change), 3) self.assertEqual(len(paths_from_change), 3)
presubmit_path = join(self.fake_root_dir, 'isdir', 'PRESUBMIT.py') presubmit_path = presubmit.os.path.join(
self.fake_root_dir, 'isdir', 'PRESUBMIT.py')
api = presubmit.InputApi( api = presubmit.InputApi(
change=change, presubmit_path=presubmit_path, change=change, presubmit_path=presubmit_path,
is_committing=True, rietveld_obj=None, verbose=False) is_committing=True, rietveld_obj=None, verbose=False)
paths_from_api = api.AbsoluteLocalPaths() paths_from_api = api.AbsoluteLocalPaths()
self.assertEqual(len(paths_from_api), 2) self.assertEqual(len(paths_from_api), 2)
for absolute_paths in [paths_from_change, paths_from_api]: for absolute_paths in [paths_from_change, paths_from_api]:
self.assertEqual(absolute_paths[0], self.assertEqual(
normpath(join(self.fake_root_dir, 'isdir'))) absolute_paths[0],
self.assertEqual(absolute_paths[1], presubmit.normpath(presubmit.os.path.join(
normpath(join(self.fake_root_dir, 'isdir', 'blat.cc'))) self.fake_root_dir, 'isdir')))
self.assertEqual(
absolute_paths[1],
presubmit.normpath(presubmit.os.path.join(
self.fake_root_dir, 'isdir', 'blat.cc')))
def testDeprecated(self): def testDeprecated(self):
presubmit.warn(mox.IgnoreArg(), category=mox.IgnoreArg(), stacklevel=2) presubmit.warn(mox.IgnoreArg(), category=mox.IgnoreArg(), stacklevel=2)

Write Preview
Loading…
Cancel
Save