Making sure logging in minidump unittest is aware when string is none.

tools/perf/core/minidump_unittest.py

 # Copyright 2015 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.
 
 import logging
 import time
 
 from telemetry.testing import tab_test_case
 from telemetry import decorators
 from telemetry.core import util
 
 class BrowserMinidumpTest(tab_test_case.TabTestCase):
   @decorators.Isolated
   @decorators.Enabled('mac')
   def testSymbolizeMinidump(self):
     # Wait for the browser to restart fully before crashing
     self._LoadPageThenWait('var sam = "car";', 'sam')
     self._browser.tabs.New().Navigate('chrome://gpucrash', timeout=5)
     crash_minidump_path = self._browser.GetMostRecentMinidumpPath()
     #self.assertIsNotNone(crash_minidump_path)
 
-    logging.info('testSymbolizeMinidump: most recent path = '
-        + crash_minidump_path)
+    if crash_minidump_path is not None:
+      logging.info('testSymbolizeMinidump: most recent path = '
+          + crash_minidump_path)
     all_paths = self._browser.GetAllMinidumpPaths()
     logging.info('testSymbolizeMinidump: all paths ' + ''.join(all_paths))
     all_unsymbolized_paths = self._browser.GetAllUnsymbolizedMinidumpPaths()
     logging.info('testSymbolizeMinidump: all unsymbolized paths '
         + ''.join(all_unsymbolized_paths))
     #self.assertTrue(len(all_unsymbolized_paths) == 1)
 
     # Now symbolize that minidump and make sure there are no longer any present
     self._browser.SymbolizeMinidump(crash_minidump_path)
 
     all_unsymbolized_after_symbolize_paths = \
         self._browser.GetAllUnsymbolizedMinidumpPaths()
     logging.info('testSymbolizeMinidump: after symbolize all '
         + 'unsymbolized paths: '
         + ''.join(all_unsymbolized_after_symbolize_paths))
     #self.assertTrue(len(all_unsymbolized_after_symbolize_paths) == 0)
 
 
   @decorators.Isolated
   @decorators.Enabled('mac')
-  @decorators.Disabled('mac')  # crbug.com/634156
   def testMultipleCrashMinidumps(self):
     # Wait for the browser to restart fully before crashing
     self._LoadPageThenWait('var cat = "dog";', 'cat')
     self._browser.tabs.New().Navigate('chrome://gpucrash', timeout=5)
     first_crash_path = self._browser.GetMostRecentMinidumpPath()
 
     #self.assertIsNotNone(first_crash_path)
-    logging.info('testMultipleCrashMinidumps: first crash most recent path'
-        + first_crash_path)
+    if first_crash_path is not None:
+      logging.info('testMultipleCrashMinidumps: first crash most recent path'
+          + first_crash_path)
     all_paths = self._browser.GetAllMinidumpPaths()
     logging.info('testMultipleCrashMinidumps: first crash all paths: '
         + ''.join(all_paths))
     #self.assertEquals(len(all_paths), 1)
     #self.assertEqual(all_paths[0], first_crash_path)
     all_unsymbolized_paths = self._browser.GetAllUnsymbolizedMinidumpPaths()
     #self.assertTrue(len(all_unsymbolized_paths) == 1)
     logging.info('testMultipleCrashMinidumps: first crash all unsymbolized '
         'paths: ' + ''.join(all_unsymbolized_paths))
 
     # Restart the browser and then crash a second time
     self._RestartBrowser()
 
     # Start a new tab in the restarted browser
     self._LoadPageThenWait('var foo = "bar";', 'foo')
 
     self._browser.tabs.New().Navigate('chrome://gpucrash', timeout=5)
     second_crash_path = self._browser.GetMostRecentMinidumpPath()
     #self.assertIsNotNone(second_crash_path)
-    logging.info('testMultipleCrashMinidumps: second crash most recent path'
-        + second_crash_path)
+    if second_crash_path is not None:
+      logging.info('testMultipleCrashMinidumps: second crash most recent path'
+          + second_crash_path)
     second_crash_all_paths = self._browser.GetAllMinidumpPaths()
     logging.info('testMultipleCrashMinidumps: second crash all paths: '
         + ''.join(second_crash_all_paths))
     second_crash_all_unsymbolized_paths = \
         self._browser.GetAllUnsymbolizedMinidumpPaths()
     #self.assertTrue(len(all_unsymbolized_paths) == 1)
     logging.info('testMultipleCrashMinidumps: second crash all unsymbolized '
         'paths: ' + ''.join(second_crash_all_unsymbolized_paths))
     #self.assertEquals(len(second_crash_all_paths), 2)
     # Check that both paths are now present and unsymbolized
@@ skipping 27 matching lines @@
     # Therefore, we are adding a 5 second wait for now to see if this can help
     # the problem until we determine if there is another chrome process we can
     # wait on to ensure that all browser load processes have finished
     time.sleep(5)
     new_tab = self._browser.tabs.New()
     new_tab.Navigate(self.UrlOfUnittestFile('blank.html'),
         script_to_evaluate_on_commit=script)
     # Wait until the javascript has run ensuring that
     # the new browser has restarted before we crash it again
     util.WaitFor(lambda: new_tab.EvaluateJavaScript(value), 60)