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

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_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
OLDNEW
1 # Copyright (C) 2010 Google Inc. All rights reserved. 1 # Copyright (C) 2010 Google Inc. All rights reserved.
2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze ged 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze ged
3 # Copyright (C) 2011 Apple Inc. All rights reserved. 3 # Copyright (C) 2011 Apple Inc. All rights reserved.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are 6 # modification, are permitted provided that the following conditions are
7 # met: 7 # met:
8 # 8 #
9 # * Redistributions of source code must retain the above copyright 9 # * Redistributions of source code must retain the above copyright
10 # notice, this list of conditions and the following disclaimer. 10 # notice, this list of conditions and the following disclaimer.
(...skipping 10 matching lines...) Expand all
21 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 21 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 22 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 23 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 24 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 30
31 import Queue
32 import StringIO
31 import codecs 33 import codecs
32 import json 34 import json
33 import logging 35 import logging
34 import os 36 import os
35 import platform 37 import platform
36 import Queue
37 import re 38 import re
38 import StringIO
39 import sys 39 import sys
40 import thread 40 import thread
41 import time 41 import time
42 import threading 42 import threading
43 import webkitpy.thirdparty.unittest2 as unittest 43 import unittest
44 44
45 from webkitpy.common.system import outputcapture, path 45 from webkitpy.common.system import outputcapture, path
46 from webkitpy.common.system.crashlogs_unittest import make_mock_crash_report_dar win 46 from webkitpy.common.system.crashlogs_unittest import make_mock_crash_report_dar win
47 from webkitpy.common.system.systemhost import SystemHost 47 from webkitpy.common.system.systemhost import SystemHost
48 from webkitpy.common.host import Host 48 from webkitpy.common.host import Host
49 from webkitpy.common.host_mock import MockHost 49 from webkitpy.common.host_mock import MockHost
50 50
51 from webkitpy.layout_tests import port 51 from webkitpy.layout_tests import port
52 from webkitpy.layout_tests import run_webkit_tests 52 from webkitpy.layout_tests import run_webkit_tests
53 from webkitpy.layout_tests.models import test_run_results 53 from webkitpy.layout_tests.models import test_run_results
(...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 stderr = StringIO.StringIO() 1052 stderr = StringIO.StringIO()
1053 res = run_webkit_tests.main(['--platform', 'test', '--exit-after-n-failu res', '1', 1053 res = run_webkit_tests.main(['--platform', 'test', '--exit-after-n-failu res', '1',
1054 'failures/unexpected/missing_text.html', 1054 'failures/unexpected/missing_text.html',
1055 'failures/unexpected/missing_image.html'], 1055 'failures/unexpected/missing_image.html'],
1056 stdout, stderr) 1056 stdout, stderr)
1057 self.assertEqual(res, test_run_results.EARLY_EXIT_STATUS) 1057 self.assertEqual(res, test_run_results.EARLY_EXIT_STATUS)
1058 self.assertEqual(stdout.getvalue(), 1058 self.assertEqual(stdout.getvalue(),
1059 ('\n' 1059 ('\n'
1060 'Regressions: Unexpected missing results (1)\n' 1060 'Regressions: Unexpected missing results (1)\n'
1061 ' failures/unexpected/missing_image.html [ Missing ]\n\n')) 1061 ' failures/unexpected/missing_image.html [ Missing ]\n\n'))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698