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

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

Issue 146173004: Fix run-blink-httpd to work w/ Apache and refactor webkitpy.layout_tests.servers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add cli_wrapper and update run-* scripts Created 6 years, 10 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 25 matching lines...) Expand all
36 import time 36 import time
37 import webkitpy.thirdparty.unittest2 as unittest 37 import webkitpy.thirdparty.unittest2 as 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.layout_tests.servers import http_server_base
47 from webkitpy.tool.mocktool import MockOptions 46 from webkitpy.tool.mocktool import MockOptions
48 47
49 48
50 # FIXME: get rid of this fixture 49 # FIXME: get rid of this fixture
51 class TestWebKitPort(Port): 50 class TestWebKitPort(Port):
52 port_name = "testwebkitport" 51 port_name = "testwebkitport"
53 52
54 def __init__(self, port_name=None, symbols_string=None, 53 def __init__(self, port_name=None, symbols_string=None,
55 expectations_file=None, skips_file=None, host=None, config=None , 54 expectations_file=None, skips_file=None, host=None, config=None ,
56 **kwargs): 55 **kwargs):
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 saved_environ = os.environ.copy() 463 saved_environ = os.environ.copy()
465 try: 464 try:
466 os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf' 465 os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf'
467 self.assertEqual(port.path_to_apache_config_file(), '/existing/httpd .conf') 466 self.assertEqual(port.path_to_apache_config_file(), '/existing/httpd .conf')
468 finally: 467 finally:
469 os.environ = saved_environ.copy() 468 os.environ = saved_environ.copy()
470 469
471 def test_additional_platform_directory(self): 470 def test_additional_platform_directory(self):
472 port = self.make_port(options=MockOptions(additional_platform_directory= ['/tmp/foo'])) 471 port = self.make_port(options=MockOptions(additional_platform_directory= ['/tmp/foo']))
473 self.assertEqual(port.baseline_search_path()[0], '/tmp/foo') 472 self.assertEqual(port.baseline_search_path()[0], '/tmp/foo')
OLDNEW
« no previous file with comments | « Tools/Scripts/webkitpy/layout_tests/port/base.py ('k') | Tools/Scripts/webkitpy/layout_tests/port/test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698