Added an integration test for kasko hang reports

chrome/test/kasko/hang_watcher_integration_test.py

 #!/usr/bin/env python
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2016 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.
 
-"""A Windows-only end-to-end integration test for Kasko, Chrome and Crashpad.
+"""A Windows-only end-to-end integration test for the Chrome hang watcher.
 
-This test ensures that the interface between Kasko and Chrome and Crashpad works
-as expected. The test causes Kasko to set certain crash keys and invoke a crash
-report, which is in turn delivered to a locally hosted test crash server. If the
-crash report is received intact with the expected crash keys then all is well.
+This test ensures that the hang watcher is able to detect when Chrome hangs and
+to generate a Kasko report. The report is then delivered to a locally hosted
+test crash server. If a crash report is received then all is well.
 
 Note that this test only works against non-component Release and Official builds
 of Chrome with Chrome branding, and attempting to use it with anything else will
 most likely lead to constant failures.
 
 Typical usage (assuming in root 'src' directory):
 
 - generate project files with the following GYP variables:
-    syzyasan=1 win_z7=0 chromium_win_pch=0
+    branding=Chrome kasko=1 kasko_hang_reports=1
 - build the release Chrome binaries:
     ninja -C out\Release chrome.exe
+    ninja -C out\Release chromedriver.exe

[chrisha, 2016/01/20 22:20:31]

This may as well be ninja -C out\Release chrome.exe chromedriver.exe

Ah, you could fix this for the other 2 .py files while you're in here (they both
also need chromedriver.exe)

[Patrick Monette, 2016/01/21 00:05:10]

Done.

 - run the test:
-    python chrome/test/kasko/kasko_integration_test.py
+    python chrome/test/kasko/hang_watcher_integration_test.py
 """
 
 import logging
 import os
 import sys
 
 # Bring in the Kasko module.
 KASKO_DIR = os.path.join(os.path.dirname(__file__), 'py')
 sys.path.append(KASKO_DIR)
 import kasko
@@ skipping 25 matching lines @@
     # Launch the test server.
     server = kasko.crash_server.CrashServer()
     with kasko.util.ScopedStartStop(server):
       _LOGGER.info('Started server on port %d', server.port)
 
       # Configure the environment so Chrome can find the test crash server.
       os.environ['KASKO_CRASH_SERVER_URL'] = (
           'http://127.0.0.1:%d/crash' % server.port)
 
       # Launch Chrome and navigate it to the test URL.
       chrome = kasko.process.ChromeInstance(options.chromedriver,

[chrisha, 2016/01/20 22:20:31]

The whole body of this test is still the same as the kasko_integration_test.
Create a new module in the python library that accepts the URL to visit, the
timeout, and the keys to validate, and refactor both those tests to use the
common code?

[Patrick Monette, 2016/01/21 00:05:10]

Done.

                                             options.chrome, user_data_dir)
       with kasko.util.ScopedStartStop(chrome):
         _LOGGER.info('Navigating to Kasko debug URL')
-        chrome.navigate_to('chrome://kasko/send-report')
+        chrome.navigate_to('chrome://delayeduithreadhang')
 
         _LOGGER.info('Waiting for Kasko report')
-        if not server.wait_for_report(10):
+        if not server.wait_for_report(120):
           raise Exception('No Kasko report received.')
 
+    # Verify a few crash keys.
     report = server.crash(0)
     kasko.report.LogCrashKeys(report)
-    kasko.report.ValidateCrashReport(report,
-        {'kasko-set-crash-key-value-impl': 'SetCrashKeyValueImpl'})
+    expected_keys = [
+      'guid',
+      'kasko-generated-by-version',
+      'kasko-uploaded-by-version',
+      'pid',
+      'plat',
+      'prod',
+      'report-id',
+      'ver',

[chrisha, 2016/01/20 22:20:31]

You should be able to use ValidateCrashReport as is. The map doesn't define the
contents of the keys... it just ensures that they are defined. The 'value'
associated with each key is used as an additional error message, hopefully
providing context to whoever is running the test.

[Patrick Monette, 2016/01/21 00:05:10]

Done.

+    ]
+    kasko.report.ValidateNonEmptyCrashKeys(report, expected_keys)
+
+    _LOGGER.info('Test passed successfully!')

[chrisha, 2016/01/20 22:20:31]

Ditto to adding this to the other couple tests... might be useful :)

[Patrick Monette, 2016/01/21 00:05:10]

Done.

 
     return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main())