Move LayoutTest Linux distribution detection to PlatformInfo

Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #    * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 22 matching lines @@
 import logging
 import os
 import socket
 import sys
 import time
 import unittest
 
 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
+from webkitpy.common.system.platforminfo_mock import MockPlatformInfo
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 from webkitpy.layout_tests.models import test_run_results
 from webkitpy.layout_tests.port.base import Port, TestConfiguration
 from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
 from webkitpy.tool.mocktool import MockOptions
 
 
 # FIXME: get rid of this fixture
 class TestWebKitPort(Port):
@@ skipping 358 matching lines @@
 000000000124f670 s __ZZN7WebCore13ff_mp3_decoder13addChildBelowEPS0_S1_E19__PRETTY_FUNCTION__
 """
         # Note 'compositing' is not in the list of skipped directories (hence the parsing of GraphicsLayer worked):
         expected_directories = set([
             "webaudio/codec-tests/aac",
         ])
         result_directories = set(TestWebKitPort(symbols_string=symbols_string)._skipped_tests_for_unsupported_features(test_list=['webaudio/codec-tests/mp3/foo.html']))
         self.assertEqual(result_directories, expected_directories)
 
     def _assert_config_file_for_platform(self, port, platform, config_file):
-        self.assertEqual(port._apache_config_file_name_for_platform(platform), config_file)
+        port.host.platform = MockPlatformInfo(os_name=platform)
+        self.assertEqual(port._apache_config_file_name_for_platform(), config_file)
 
-    def test_linux_distro_detection(self):
-        port = TestWebKitPort()
-        self.assertFalse(port._is_redhat_based())
-        self.assertFalse(port._is_debian_based())
-
-        port._filesystem = MockFileSystem({'/etc/redhat-release': ''})
-        self.assertTrue(port._is_redhat_based())
-        self.assertFalse(port._is_debian_based())
-
-        port._filesystem = MockFileSystem({'/etc/debian_version': ''})
-        self.assertFalse(port._is_redhat_based())
-        self.assertTrue(port._is_debian_based())
+    def _assert_config_file_for_linux_distribution(self, port, distribution, config_file):
+        port.host.platform = MockPlatformInfo(os_name='linux', linux_distribution=distribution)
+        self.assertEqual(port._apache_config_file_name_for_platform(), config_file)
 
     def test_apache_config_file_name_for_platform(self):
         port = TestWebKitPort()
         self._assert_config_file_for_platform(port, 'cygwin', 'cygwin-httpd.conf')
 
         port._apache_version = lambda: '2.2'
-        self._assert_config_file_for_platform(port, 'linux2', 'apache2-httpd-2.2.conf')
-        self._assert_config_file_for_platform(port, 'linux3', 'apache2-httpd-2.2.conf')
-
-        port._is_redhat_based = lambda: True
-        self._assert_config_file_for_platform(port, 'linux2', 'fedora-httpd-2.2.conf')
-
-        port = TestWebKitPort()
-        port._is_debian_based = lambda: True
-        port._apache_version = lambda: '2.2'
-        self._assert_config_file_for_platform(port, 'linux2', 'debian-httpd-2.2.conf')
+        self._assert_config_file_for_platform(port, 'linux', 'apache2-httpd-2.2.conf')
+        self._assert_config_file_for_linux_distribution(port, 'arch', 'arch-httpd-2.2.conf')
+        self._assert_config_file_for_linux_distribution(port, 'debian', 'debian-httpd-2.2.conf')
+        self._assert_config_file_for_linux_distribution(port, 'slackware', 'apache2-httpd-2.2.conf')
+        self._assert_config_file_for_linux_distribution(port, 'redhat', 'redhat-httpd-2.2.conf')
 
         self._assert_config_file_for_platform(port, 'mac', 'apache2-httpd-2.2.conf')
         self._assert_config_file_for_platform(port, 'win32', 'apache2-httpd-2.2.conf')  # win32 isn't a supported sys.platform.  AppleWin/WinCairo/WinCE ports all use cygwin.
         self._assert_config_file_for_platform(port, 'barf', 'apache2-httpd-2.2.conf')
 
     def test_path_to_apache_config_file(self):
         port = TestWebKitPort()
 
         saved_environ = os.environ.copy()
         try:
             os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/path/to/httpd.conf'
             self.assertRaises(IOError, port.path_to_apache_config_file)
             port._filesystem.write_text_file('/existing/httpd.conf', 'Hello, world!')
             os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf'
             self.assertEqual(port.path_to_apache_config_file(), '/existing/httpd.conf')
         finally:
             os.environ = saved_environ.copy()
 
-        # Mock out _apache_config_file_name_for_platform to ignore the passed sys.platform value.
-        port._apache_config_file_name_for_platform = lambda platform: 'httpd.conf'
+        # Mock out _apache_config_file_name_for_platform to avoid mocking platform info
+        port._apache_config_file_name_for_platform = lambda: 'httpd.conf'
         self.assertEqual(port.path_to_apache_config_file(), '/mock-checkout/third_party/WebKit/LayoutTests/http/conf/httpd.conf')
 
         # Check that even if we mock out _apache_config_file_name, the environment variable takes precedence.
         saved_environ = os.environ.copy()
         try:
             os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf'
             self.assertEqual(port.path_to_apache_config_file(), '/existing/httpd.conf')
         finally:
             os.environ = saved_environ.copy()
 
     def test_additional_platform_directory(self):
         port = self.make_port(options=MockOptions(additional_platform_directory=['/tmp/foo']))
         self.assertEqual(port.baseline_search_path()[0], '/tmp/foo')
 
     def test_virtual_test_suites(self):
         # We test that we can load the real LayoutTests/VirtualTestSuites file properly, so we
         # use a real SystemHost(). We don't care what virtual_test_suites() returns as long
         # as it is iterable.
         port = self.make_port(host=SystemHost(), port_name=self.full_port_name)
         self.assertTrue(isinstance(port.virtual_test_suites(), collections.Iterable))