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

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

Issue 47023017: Make http LayoutTests work in Debian with Apache 2.4. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Picked fixup committed by allan.jensen@digia.com on the same day as the initial patch. Created 7 years, 1 month 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
« no previous file with comments | « Tools/Scripts/webkitpy/layout_tests/port/base.py ('k') | no next file » | 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) 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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 390
391 self._assert_config_file_for_platform(port, 'linux2', 'apache2-httpd.con f') 391 self._assert_config_file_for_platform(port, 'linux2', 'apache2-httpd.con f')
392 self._assert_config_file_for_platform(port, 'linux3', 'apache2-httpd.con f') 392 self._assert_config_file_for_platform(port, 'linux3', 'apache2-httpd.con f')
393 393
394 port._is_redhat_based = lambda: True 394 port._is_redhat_based = lambda: True
395 port._apache_version = lambda: '2.2' 395 port._apache_version = lambda: '2.2'
396 self._assert_config_file_for_platform(port, 'linux2', 'fedora-httpd-2.2. conf') 396 self._assert_config_file_for_platform(port, 'linux2', 'fedora-httpd-2.2. conf')
397 397
398 port = TestWebKitPort() 398 port = TestWebKitPort()
399 port._is_debian_based = lambda: True 399 port._is_debian_based = lambda: True
400 self._assert_config_file_for_platform(port, 'linux2', 'apache2-debian-ht tpd.conf') 400 port._apache_version = lambda: '2.2'
401 self._assert_config_file_for_platform(port, 'linux2', 'debian-httpd-2.2. conf')
401 402
402 self._assert_config_file_for_platform(port, 'mac', 'apache2-httpd.conf') 403 self._assert_config_file_for_platform(port, 'mac', 'apache2-httpd.conf')
403 self._assert_config_file_for_platform(port, 'win32', 'apache2-httpd.conf ') # win32 isn't a supported sys.platform. AppleWin/WinCairo/WinCE ports all u se cygwin. 404 self._assert_config_file_for_platform(port, 'win32', 'apache2-httpd.conf ') # win32 isn't a supported sys.platform. AppleWin/WinCairo/WinCE ports all u se cygwin.
404 self._assert_config_file_for_platform(port, 'barf', 'apache2-httpd.conf' ) 405 self._assert_config_file_for_platform(port, 'barf', 'apache2-httpd.conf' )
405 406
406 def test_path_to_apache_config_file(self): 407 def test_path_to_apache_config_file(self):
407 port = TestWebKitPort() 408 port = TestWebKitPort()
408 409
409 saved_environ = os.environ.copy() 410 saved_environ = os.environ.copy()
410 try: 411 try:
(...skipping 13 matching lines...) Expand all
424 saved_environ = os.environ.copy() 425 saved_environ = os.environ.copy()
425 try: 426 try:
426 os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf' 427 os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf'
427 self.assertEqual(port._path_to_apache_config_file(), '/existing/http d.conf') 428 self.assertEqual(port._path_to_apache_config_file(), '/existing/http d.conf')
428 finally: 429 finally:
429 os.environ = saved_environ.copy() 430 os.environ = saved_environ.copy()
430 431
431 def test_additional_platform_directory(self): 432 def test_additional_platform_directory(self):
432 port = self.make_port(options=MockOptions(additional_platform_directory= ['/tmp/foo'])) 433 port = self.make_port(options=MockOptions(additional_platform_directory= ['/tmp/foo']))
433 self.assertEqual(port.baseline_search_path()[0], '/tmp/foo') 434 self.assertEqual(port.baseline_search_path()[0], '/tmp/foo')
OLDNEW
« no previous file with comments | « Tools/Scripts/webkitpy/layout_tests/port/base.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698