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

Side by Side Diff: Tools/Scripts/webkitpy/test/runner_unittest.py

Issue 478553002: Remove thirdparty/unittest2 from webkitpy and require python2.7. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Tools/Scripts/webkitpy/test/runner.py ('k') | Tools/Scripts/webkitpy/test/skip_unittest.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (C) 2012 Google, Inc. 1 # Copyright (C) 2012 Google, Inc.
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions 4 # modification, are permitted provided that the following conditions
5 # are met: 5 # are met:
6 # 1. Redistributions of source code must retain the above copyright 6 # 1. Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # 2. Redistributions in binary form must reproduce the above copyright 8 # 2. Redistributions in binary form must reproduce the above copyright
9 # notice, this list of conditions and the following disclaimer in the 9 # notice, this list of conditions and the following disclaimer in the
10 # documentation and/or other materials provided with the distribution. 10 # documentation and/or other materials provided with the distribution.
11 # 11 #
12 # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND 12 # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
13 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 13 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
14 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 14 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
15 # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR 15 # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
16 # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 16 # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
17 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 17 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
18 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 18 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
19 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 19 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
20 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 20 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22 22
23 import StringIO
23 import logging 24 import logging
24 import re 25 import re
25 import StringIO 26 import unittest
26 import webkitpy.thirdparty.unittest2 as unittest
27 27
28 from webkitpy.common.system.filesystem import FileSystem 28 from webkitpy.common.system.filesystem import FileSystem
29 from webkitpy.common.webkit_finder import WebKitFinder 29 from webkitpy.common.webkit_finder import WebKitFinder
30 30
31 from webkitpy.tool.mocktool import MockOptions 31 from webkitpy.tool.mocktool import MockOptions
32 from webkitpy.test.printer import Printer 32 from webkitpy.test.printer import Printer
33 from webkitpy.test.runner import Runner 33 from webkitpy.test.runner import Runner
34 34
35 35
36 class FakeModuleSuite(object): 36 class FakeModuleSuite(object):
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 options = MockOptions(verbose=verbose, timing=timing, child_processes=ch ild_processes, quiet=quiet, pass_through=False) 91 options = MockOptions(verbose=verbose, timing=timing, child_processes=ch ild_processes, quiet=quiet, pass_through=False)
92 stream = StringIO.StringIO() 92 stream = StringIO.StringIO()
93 loader = FakeLoader(('test1 (Foo)', '.', ''), 93 loader = FakeLoader(('test1 (Foo)', '.', ''),
94 ('test2 (Foo)', 'F', 'test2\nfailed'), 94 ('test2 (Foo)', 'F', 'test2\nfailed'),
95 ('test3 (Foo)', 'E', 'test3\nerred')) 95 ('test3 (Foo)', 'E', 'test3\nerred'))
96 runner = Runner(Printer(stream, options), loader, WebKitFinder(FileSyste m())) 96 runner = Runner(Printer(stream, options), loader, WebKitFinder(FileSyste m()))
97 runner.run(['Foo.test1', 'Foo.test2', 'Foo.test3'], 1) 97 runner.run(['Foo.test1', 'Foo.test2', 'Foo.test3'], 1)
98 self.assertEqual(runner.tests_run, 3) 98 self.assertEqual(runner.tests_run, 3)
99 self.assertEqual(len(runner.failures), 1) 99 self.assertEqual(len(runner.failures), 1)
100 self.assertEqual(len(runner.errors), 1) 100 self.assertEqual(len(runner.errors), 1)
OLDNEW
« no previous file with comments | « Tools/Scripts/webkitpy/test/runner.py ('k') | Tools/Scripts/webkitpy/test/skip_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698