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

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/port/port_testcase.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 # 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 are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following disclaimer 10 # copyright notice, this list of conditions and the following disclaimer
(...skipping 16 matching lines...) Expand all
27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 28
29 """Unit testing base class for Port implementations.""" 29 """Unit testing base class for Port implementations."""
30 30
31 import errno 31 import errno
32 import logging 32 import logging
33 import os 33 import os
34 import socket 34 import socket
35 import sys 35 import sys
36 import time 36 import time
37 import webkitpy.thirdparty.unittest2 as unittest 37 import unittest
38 38
39 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2 39 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
40 from webkitpy.common.system.filesystem_mock import MockFileSystem 40 from webkitpy.common.system.filesystem_mock import MockFileSystem
41 from webkitpy.common.system.outputcapture import OutputCapture 41 from webkitpy.common.system.outputcapture import OutputCapture
42 from webkitpy.common.system.systemhost_mock import MockSystemHost 42 from webkitpy.common.system.systemhost_mock import MockSystemHost
43 from webkitpy.layout_tests.models import test_run_results 43 from webkitpy.layout_tests.models import test_run_results
44 from webkitpy.layout_tests.port.base import Port, TestConfiguration 44 from webkitpy.layout_tests.port.base import Port, TestConfiguration
45 from webkitpy.layout_tests.port.server_process_mock import MockServerProcess 45 from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
46 from webkitpy.tool.mocktool import MockOptions 46 from webkitpy.tool.mocktool import MockOptions
47 47
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 saved_environ = os.environ.copy() 462 saved_environ = os.environ.copy()
463 try: 463 try:
464 os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf' 464 os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf'
465 self.assertEqual(port.path_to_apache_config_file(), '/existing/httpd .conf') 465 self.assertEqual(port.path_to_apache_config_file(), '/existing/httpd .conf')
466 finally: 466 finally:
467 os.environ = saved_environ.copy() 467 os.environ = saved_environ.copy()
468 468
469 def test_additional_platform_directory(self): 469 def test_additional_platform_directory(self):
470 port = self.make_port(options=MockOptions(additional_platform_directory= ['/tmp/foo'])) 470 port = self.make_port(options=MockOptions(additional_platform_directory= ['/tmp/foo']))
471 self.assertEqual(port.baseline_search_path()[0], '/tmp/foo') 471 self.assertEqual(port.baseline_search_path()[0], '/tmp/foo')
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698