Merge request for ChromeDriver to m68 branch |
||||
Issue descriptionRequesting merge for the following changes to m68 (refs/branch-heads/3440) branch: * https://chromium-review.googlesource.com/1106769 Improve desktop launch errors and report them faster (work originally done in https://bugs.chromium.org/p/chromedriver/issues/detail?id=2474) * https://chromium-review.googlesource.com/1133421 Return debugging port in capabilities (work originally done in https://bugs.chromium.org/p/chromedriver/issues/detail?id=2379) * https://chromium-review.googlesource.com/1137440 Allow user-defined remote-debugging-port (work originally done in https://bugs.chromium.org/p/chromium/issues/detail?id=863247&desc=2) * https://chromium-review.googlesource.com/1141163 Check for Chrome crashes after 1 second rather than 60 seconds ((work originally done in https://bugs.chromium.org/p/chromium/issues/detail?id=864205) Note that these changes are in ChromeDriver directory (src/chrome/test/chromedriver), and Chrome does not depend on that at all, so these will have no impact on Chrome binary that is shipping. See go/chromedriver-versioning and go/chops-proj-rev-27 for background.
,
Jul 20
Approving merge to M68. Branch:3440
,
Jul 20
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/098d811ecd69b09de22858e0552ed77aa330d4f1 commit 098d811ecd69b09de22858e0552ed77aa330d4f1 Author: John Chen <johnchen@chromium.org> Date: Fri Jul 20 17:43:03 2018 [ChromeDriver] Improve desktop launch errors and report them faster. 1. Enforce our lack of support for a custom remote-debugging-port by throwing an error if someone uses it. 2. If we can't parse a devtools port from the file, then check to see if Chrome has crashed and use that information to improve the error message. Do this right away instead of waiting 60 seconds. 3. Write tests for these errors! TBR=crouleau@chromium.org (cherry picked from commit 0a6b1c3e92f57af7fe80e42a366fda8a8efd7992) Bug: 865982 , chromedriver:2474 Change-Id: Ie649f980745e5241ec462e7527a24d58ced9af02 Reviewed-on: https://chromium-review.googlesource.com/1106769 Commit-Queue: Caleb Rouleau <crouleau@chromium.org> Reviewed-by: John Chen <johnchen@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#569393} Reviewed-on: https://chromium-review.googlesource.com/1145223 Cr-Commit-Position: refs/branch-heads/3440@{#727} Cr-Branched-From: 010ddcfda246975d194964ccf20038ebbdec6084-refs/heads/master@{#561733} [modify] https://crrev.com/098d811ecd69b09de22858e0552ed77aa330d4f1/chrome/test/chromedriver/chrome_launcher.cc [modify] https://crrev.com/098d811ecd69b09de22858e0552ed77aa330d4f1/chrome/test/chromedriver/chrome_launcher.h [modify] https://crrev.com/098d811ecd69b09de22858e0552ed77aa330d4f1/chrome/test/chromedriver/chrome_launcher_unittest.cc [modify] https://crrev.com/098d811ecd69b09de22858e0552ed77aa330d4f1/chrome/test/chromedriver/test/run_py_tests.py
,
Jul 20
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/629843e7aae3822f2f196e5c8fd230fd9867d847 commit 629843e7aae3822f2f196e5c8fd230fd9867d847 Author: John Chen <johnchen@chromium.org> Date: Fri Jul 20 17:51:40 2018 [ChromeDriver] Return debugging port in capabilities Add a new entry chrome.debuggerAddress in the capabilities returned from InitSession command. It contains the hostname and port to reach Chrome's remote debugging port. Also removed an unused constructor in struct BrowserInfo. TBR=crouleau@chromium.org Bug: 865982 , chromedriver:2379 Change-Id: Ic36c08eb7fe42b27fa1ba796ee10c511d76ef804 Reviewed-on: https://chromium-review.googlesource.com/1133421 Reviewed-by: Caleb Rouleau <crouleau@chromium.org> Commit-Queue: John Chen <johnchen@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#574640}(cherry picked from commit 403b2e9ab1b7ebe8d476a38052fc8a242b9f7d1a) Reviewed-on: https://chromium-review.googlesource.com/1144063 Reviewed-by: John Chen <johnchen@chromium.org> Cr-Commit-Position: refs/branch-heads/3440@{#728} Cr-Branched-From: 010ddcfda246975d194964ccf20038ebbdec6084-refs/heads/master@{#561733} [modify] https://crrev.com/629843e7aae3822f2f196e5c8fd230fd9867d847/chrome/test/chromedriver/chrome/browser_info.cc [modify] https://crrev.com/629843e7aae3822f2f196e5c8fd230fd9867d847/chrome/test/chromedriver/chrome/browser_info.h [modify] https://crrev.com/629843e7aae3822f2f196e5c8fd230fd9867d847/chrome/test/chromedriver/chrome/devtools_http_client.cc [modify] https://crrev.com/629843e7aae3822f2f196e5c8fd230fd9867d847/chrome/test/chromedriver/session_commands.cc
,
Jul 20
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/e1900fcf6f18caff57faf059b368e9c2f93edd2c commit e1900fcf6f18caff57faf059b368e9c2f93edd2c Author: Caleb Rouleau <crouleau@chromium.org> Date: Fri Jul 20 17:57:58 2018 [ChromeDriver] Allow user-defined remote-debugging-port. Chromium Embedded Framework sometimes uses an in-memory user-data-dir, so the DevToolsActivePort file is not a viable option for them. We think it is likely that other Chromium variants, present or future, may have trouble with the DevToolsActivePort file, so this should make things easier for them. Also, fix testConnectToRemoteBrowser to 1. Have retries so it passes in the case of a race condition for port allocation. 2. Prevent a race with Chrome during teardown. -- Note that this race was causing the user-data-dir to not be deleted at the end. TBR=crouleau@chromium.org Bug: 865982 , 863247 Change-Id: I506be26fc2e282b7194afd88afd02efcec65e880 Reviewed-on: https://chromium-review.googlesource.com/1137440 Commit-Queue: Caleb Rouleau <crouleau@chromium.org> Reviewed-by: John Chen <johnchen@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#575408}(cherry picked from commit 80104bfcec5f4544b8e14538bdb00451995750c8) Reviewed-on: https://chromium-review.googlesource.com/1145560 Cr-Commit-Position: refs/branch-heads/3440@{#729} Cr-Branched-From: 010ddcfda246975d194964ccf20038ebbdec6084-refs/heads/master@{#561733} [modify] https://crrev.com/e1900fcf6f18caff57faf059b368e9c2f93edd2c/chrome/test/chromedriver/chrome_launcher.cc [modify] https://crrev.com/e1900fcf6f18caff57faf059b368e9c2f93edd2c/chrome/test/chromedriver/test/run_py_tests.py [modify] https://crrev.com/e1900fcf6f18caff57faf059b368e9c2f93edd2c/chrome/test/chromedriver/util.py
,
Jul 20
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/020005247508092e88be9246f281f822b5751430 commit 020005247508092e88be9246f281f822b5751430 Author: Caleb Rouleau <crouleau@chromium.org> Date: Fri Jul 20 18:01:12 2018 [ChromeDriver] Check for Chrome crashes after 1 second rather than 60 seconds TBR=crouleau@chromium.org Bug: 865982 , 864205 Change-Id: I5d9ad26b1f14ae28ca1b80399539dbb3c3a978ee Reviewed-on: https://chromium-review.googlesource.com/1141163 Reviewed-by: John Chen <johnchen@chromium.org> Commit-Queue: Caleb Rouleau <crouleau@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#576227}(cherry picked from commit 1ca17c55c4e23840893be64e18b80518ea26da85) Reviewed-on: https://chromium-review.googlesource.com/1145561 Cr-Commit-Position: refs/branch-heads/3440@{#730} Cr-Branched-From: 010ddcfda246975d194964ccf20038ebbdec6084-refs/heads/master@{#561733} [modify] https://crrev.com/020005247508092e88be9246f281f822b5751430/chrome/test/chromedriver/chrome_launcher.cc
,
Jul 20
All changes listed in the description are now merged into m68. |
||||
►
Sign in to add a comment |
||||
Comment 1 by sheriffbot@chromium.org
, Jul 20