diff options
author | glider <glider@chromium.org> | 2015-02-17 03:18:11 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-17 11:19:16 +0000 |
commit | 99aac94df710244f8a5c1b3f7b55b00fe1bd9998 (patch) | |
tree | 88256c27e116f1c53f9fe1a9d75254a083576205 /PRESUBMIT_test.py | |
parent | 749a85c93fcb8f708bcb465dd9dde8d78a8ed5f5 (diff) | |
download | chromium_src-99aac94df710244f8a5c1b3f7b55b00fe1bd9998.zip chromium_src-99aac94df710244f8a5c1b3f7b55b00fe1bd9998.tar.gz chromium_src-99aac94df710244f8a5c1b3f7b55b00fe1bd9998.tar.bz2 |
Revert of Add a presubmit check that warns about declaring Singleton<T> in header files (patchset #2 id:20001 of https://codereview.chromium.org/929043002/)
Reason for revert:
Reverting because of presubmit crashes:
Traceback (most recent call last):
File "/usr/local/google/ssd/depot_tools/git_cl.py", line 2983, in <module>
sys.exit(main(sys.argv[1:]))
File "/usr/local/google/ssd/depot_tools/git_cl.py", line 2969, in main
return dispatcher.execute(OptionParser(), argv)
File "/usr/local/google/ssd/depot_tools/subcommand.py", line 245, in execute
return command(parser, args[1:])
File "/usr/local/google/ssd/depot_tools/git_cl.py", line 1614, in CMDpresubmit
change=cl.GetChange(base_branch, None))
File "/usr/local/google/ssd/depot_tools/git_cl.py", line 936, in RunHook
rietveld_obj=self.RpcServer())
File "/usr/local/google/ssd/depot_tools/presubmit_support.py", line 1396, in DoPresubmitChecks
results += executer.ExecPresubmitScript(presubmit_script, filename)
File "/usr/local/google/ssd/depot_tools/presubmit_support.py", line 1313, in ExecPresubmitScript
result = eval(function_name + '(*__args)', context)
File "<string>", line 1, in <module>
File "<string>", line 1727, in CheckChangeOnCommit
File "<string>", line 1455, in _CommonChecks
File "<string>", line 1322, in _CheckSingletonInHeaders
File "/usr/local/google/ssd/depot_tools/presubmit_support.py", line 472, in ReadFile
raise IOError('Access outside the repository root is denied.')
IOError: Access outside the repository root is denied.
Original issue's description:
> Add a presubmit check that warns about declaring Singleton<T> in header files
> (except for base/memory/singleton.h)
> This check is copied from presubmit_canned_checks.py in depot_tools/ with an
> added exception for base/memory/singleton.h.
> The corresponding code will be removed from presubmit_canned_checks.py afterwards.
>
> BUG=349861
> R=phajdan.jr@chromium.org,
>
> Committed: https://crrev.com/9b73d0393037452d13358f4e2766cb62adbdede8
> Cr-Commit-Position: refs/heads/master@{#316546}
TBR=phajdan.jr@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=349861
Review URL: https://codereview.chromium.org/934723003
Cr-Commit-Position: refs/heads/master@{#316559}
Diffstat (limited to 'PRESUBMIT_test.py')
-rwxr-xr-x | PRESUBMIT_test.py | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py index 7de0c3b..00997b4 100755 --- a/PRESUBMIT_test.py +++ b/PRESUBMIT_test.py @@ -384,33 +384,6 @@ class BadExtensionsTest(unittest.TestCase): self.assertEqual({}, results) -class CheckSingletonInHeadersTest(unittest.TestCase): - def testSingletonInArbitraryHeader(self): - diff_singleton_h = ['base::subtle::AtomicWord ' - 'Singleton<Type, Traits, DifferentiatingType>::'] - diff_foo_h = ['// Singleton<Foo> in comment.', - 'friend class Singleton<Foo>'] - diff_bad_h = ['Foo* foo = Singleton<Foo>::get();'] - mock_input_api = MockInputApi() - mock_input_api.files = [MockFile('base/memory/singleton.h', - diff_singleton_h), - MockFile('foo.h', diff_foo_h), - MockFile('bad.h', diff_bad_h)] - warnings = PRESUBMIT._CheckSingletonInHeaders(mock_input_api, - MockOutputApi()) - self.assertEqual(1, len(warnings)) - self.assertEqual('error', warnings[0].type) - self.assertTrue('Found Singleton<T>' in warnings[0].message) - - def testSingletonInCC(self): - diff_cc = ['Foo* foo = Singleton<Foo>::get();'] - mock_input_api = MockInputApi() - mock_input_api.files = [MockFile('some/path/foo.cc', diff_cc)] - warnings = PRESUBMIT._CheckSingletonInHeaders(mock_input_api, - MockOutputApi()) - self.assertEqual(0, len(warnings)) - - class InvalidOSMacroNamesTest(unittest.TestCase): def testInvalidOSMacroNames(self): lines = ['#if defined(OS_WINDOWS)', |