Access environment variables through Host object instead of directly.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.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 1032 matching lines @@
     def num_workers(self, requested_num_workers):
         """Returns the number of available workers (possibly less than the number requested)."""
         return requested_num_workers
 
     def clean_up_test_run(self):
         """Perform port-specific work at the end of a test run."""
         if self._image_differ:
             self._image_differ.stop()
             self._image_differ = None
 
-    # FIXME: os.environ access should be moved to onto a common/system class to be more easily mockable.
-    def _value_or_default_from_environ(self, name, default=None):
-        if name in os.environ:
-            return os.environ[name]
-        return default
-
-    def _copy_value_from_environ_if_set(self, clean_env, name):
-        if name in os.environ:
-            clean_env[name] = os.environ[name]
-
     def setup_environ_for_server(self):
-        # We intentionally copy only a subset of os.environ when
+        # We intentionally copy only a subset of the environment when
         # launching subprocesses to ensure consistent test results.
         clean_env = {
             'LOCAL_RESOURCE_ROOT': self.layout_tests_dir(),  # FIXME: Is this used?
         }
         variables_to_copy = [
             'WEBKIT_TESTFONTS',  # FIXME: Is this still used?
             'WEBKITOUTPUTDIR',   # FIXME: Is this still used?
             'CHROME_DEVEL_SANDBOX',
             'CHROME_IPC_LOGGING',
             'ASAN_OPTIONS',
             'TSAN_OPTIONS',
             'MSAN_OPTIONS',
             'LSAN_OPTIONS',
             'UBSAN_OPTIONS',
             'VALGRIND_LIB',
             'VALGRIND_LIB_INNER',
         ]
         if self.host.platform.is_linux() or self.host.platform.is_freebsd():
             variables_to_copy += [
                 'XAUTHORITY',
                 'HOME',
                 'LANG',
                 'LD_LIBRARY_PATH',
                 'DBUS_SESSION_BUS_ADDRESS',
                 'XDG_DATA_DIRS',
             ]
-            clean_env['DISPLAY'] = self._value_or_default_from_environ('DISPLAY', ':1')
+            clean_env['DISPLAY'] = self.host.environ.get('DISPLAY', ':1')
         if self.host.platform.is_mac():
             clean_env['DYLD_LIBRARY_PATH'] = self._build_path()
             variables_to_copy += [
                 'HOME',
             ]
         if self.host.platform.is_win():
             variables_to_copy += [
                 'PATH',
                 'GYP_DEFINES',  # Required to locate win sdk.
             ]
         if self.host.platform.is_cygwin():
             variables_to_copy += [
                 'HOMEDRIVE',
                 'HOMEPATH',
                 '_NT_SYMBOL_PATH',
             ]
 
         for variable in variables_to_copy:
-            self._copy_value_from_environ_if_set(clean_env, variable)
+            if variable in self.host.environ:
+                clean_env[variable] = self.host.environ[variable]
 
         for string_variable in self.get_option('additional_env_var', []):
             [name, value] = string_variable.split('=', 1)
             clean_env[name] = value
 
         return clean_env
 
     def show_results_html_file(self, results_filename):
         """This routine should display the HTML file pointed at by
         results_filename in a users' browser."""
@@ skipping 318 matching lines @@
         """
         raise NotImplementedError('Port.path_to_apache')
 
     def path_to_apache_config_file(self):
         """Returns the full path to the apache configuration file.
 
         If the WEBKIT_HTTP_SERVER_CONF_PATH environment variable is set, its
         contents will be used instead.
 
         This is needed only by ports that use the apache_http_server module."""
-        config_file_from_env = os.environ.get('WEBKIT_HTTP_SERVER_CONF_PATH')
+        config_file_from_env = self.host.environ.get('WEBKIT_HTTP_SERVER_CONF_PATH')
         if config_file_from_env:
             if not self._filesystem.exists(config_file_from_env):
                 raise IOError('%s was not found on the system' % config_file_from_env)
             return config_file_from_env
 
         config_file_name = self._apache_config_file_name_for_platform()
         return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', config_file_name)
 
     #
     # PROTECTED ROUTINES
@@ skipping 69 matching lines @@
         return None
 
     def _get_crash_log(self, name, pid, stdout, stderr, newer_than):
         if self.output_contains_sanitizer_messages(stderr):
             # Running the symbolizer script can take a lot of memory, so we need to
             # serialize access to it across all the concurrently running drivers.
 
             llvm_symbolizer_path = self.path_from_chromium_base(
                 'third_party', 'llvm-build', 'Release+Asserts', 'bin', 'llvm-symbolizer')
             if self._filesystem.exists(llvm_symbolizer_path):
-                env = os.environ.copy()
+                env = self.host.environ.copy()
                 env['LLVM_SYMBOLIZER_PATH'] = llvm_symbolizer_path
             else:
                 env = None
             sanitizer_filter_path = self.path_from_chromium_base('tools', 'valgrind', 'asan', 'asan_symbolize.py')
             sanitizer_strip_path_prefix = 'Release/../../'
             if self._filesystem.exists(sanitizer_filter_path):
                 stderr = self._executive.run_command(
                     ['flock', sys.executable, sanitizer_filter_path, sanitizer_strip_path_prefix], input=stderr, decode_output=False, env=env)
 
         name_str = name or '<unknown process name>'
@@ skipping 238 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)