Chrome Endure tests no longer unnecessarily check for Deep Memory Profiler platform support.

chrome/test/functional/perf_endure.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Performance tests for Chrome Endure (long-running perf tests on Chrome).
 
 This module accepts the following environment variable inputs:
   TEST_LENGTH: The number of seconds in which to run each test.
   PERF_STATS_INTERVAL: The number of seconds to wait in-between each sampling
@@ skipping 51 matching lines @@
   def setUp(self):
     # The environment variables for the Deep Memory Profiler must be set
     # before perf.BasePerfTest.setUp() to inherit them to Chrome.
     self._deep_memory_profile = self._GetDeepMemoryProfileEnv(
         'DEEP_MEMORY_PROFILE', bool, self._DEEP_MEMORY_PROFILE)
 
     self._deep_memory_profile_interval = self._GetDeepMemoryProfileEnv(
         'DEEP_MEMORY_PROFILE_INTERVAL', int, self._DEEP_MEMORY_PROFILE_INTERVAL)
 
     if self._deep_memory_profile:
+      if not self.IsLinux():
+        raise NotSupportedEnvironmentError(
+            'Deep Memory Profiler is not supported in this environment (OS).')
       dir_prefix = 'endure.%s.' % datetime.today().strftime('%Y%m%d.%H%M%S')
       self._deep_tempdir = tempfile.mkdtemp(prefix=dir_prefix)
       os.environ['HEAPPROFILE'] = os.path.join(self._deep_tempdir, 'endure')
       os.environ['HEAP_PROFILE_MMAP'] = 'True'
       os.environ['DEEP_HEAP_PROFILE'] = 'True'
       # TODO(dmikurube): Stop to set HEAP_PROFILE_TIME_INTERVAL when PyAuto
       # supports to dump renderer heap profile.
       os.environ['HEAP_PROFILE_TIME_INTERVAL'] = (
           str(self._deep_memory_profile_interval))
 
@@ skipping 56 matching lines @@
   def _GetDeepMemoryProfileEnv(self, env_name, converter, default):
     """Returns a converted environment variable for the Deep Memory Profiler.
 
     Args:
       env_name: A string name of an environment variable.
       converter: A function taking a string to convert an environment variable.
       default: A value used if the environment variable is not specified.
 
     Returns:
       A value converted from the environment variable with 'converter'.
-
-    Raises:
-      NotSupportedEnvironmentError if the environment (OS) is not supported.
     """
-    if not self.IsLinux():
-      raise NotSupportedEnvironmentError(
-          'Deep Memory Profiler is not supported in this environment (OS).')
     return converter(os.environ.get(env_name, default))
 
   def _WaitForDeepMemoryProfiler(self):
     """Waits for the Deep Memory Profiler to finish if running."""
     if self._deep_memory_profile and self._deep_memory_profile_proc:
       self._deep_memory_profile_proc.wait()
       self._deep_memory_profile_proc = None
       if self._deep_memory_profile_json_file:
         self._deep_memory_profile_last_json_filename = (
             self._deep_memory_profile_json_file.name)
@@ skipping 905 matching lines @@
           self._driver, self._wait, 'id("state")[text()="offline"]'):
         self._num_errors += 1
       time.sleep(1)
 
     self._RunEndureTest(self._webapp_name, self._tab_title_substring,
                         test_description, scenario)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()