Revert 222145 "keep_test_server_ports to BrowserOptions (this sh..."

Revert 222145 "keep_test_server_ports to BrowserOptions (this sh..."

Attempt to fix testGotQueryParams on 10.6 and 10.7

> keep_test_server_ports to BrowserOptions (this should probably go into AndroidBrowserOptions). android_rndis is a new ctor arg to AndroidBrowserBackend.
> 
> BUG=269131
> TEST=trybot
> 
> Review URL: https://chromiumcodereview.appspot.com/23619022

TBR=achuith@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=222220

[Vitaly Buka (NO REVIEWS), 2013-09-10 08:47:07]

Committed patchset #1 manually as r222220.

[Vitaly Buka (NO REVIEWS), 2013-09-10 09:01:35]

On 2013/09/10 08:47:07, Vitaly Buka wrote:
> Committed patchset #1 manually as r222220.

PageMeasurementUnitTest.testGotQueryParams

@@@STEP_LOG_LINE@testGotQueryParams@PageMeasurementUnitTest.testGotQueryParams:
@@@
@@@STEP_LOG_LINE@testGotQueryParams@Traceback (most recent call last):@@@
@@@STEP_LOG_LINE@testGotQueryParams@File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_measurement_unittest.py",
line 70, in testGotQueryParams@@@
@@@STEP_LOG_LINE@testGotQueryParams@all_results =
self.RunMeasurement(measurement, ps, options=self._options)@@@
@@@STEP_LOG_LINE@testGotQueryParams@File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_measurement_unittest_base.py",
line 48, in RunMeasurement@@@
@@@STEP_LOG_LINE@testGotQueryParams@return page_runner.Run(measurement, ps,
expectations, options)@@@
@@@STEP_LOG_LINE@testGotQueryParams@File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 286, in Run@@@
@@@STEP_LOG_LINE@testGotQueryParams@possible_browser, results, state)@@@
@@@STEP_LOG_LINE@testGotQueryParams@File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 192, in _PrepareAndRunPage@@@
@@@STEP_LOG_LINE@testGotQueryParams@results_for_current_run, finder_options)@@@
@@@STEP_LOG_LINE@testGotQueryParams@File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 395, in _RunPage@@@
@@@STEP_LOG_LINE@testGotQueryParams@test.Run(finder_options, page, tab,
results)@@@
@@@STEP_LOG_LINE@testGotQueryParams@File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_test.py",
line 176, in Run@@@
@@@STEP_LOG_LINE@testGotQueryParams@self._test_method(page, tab, results)@@@
@@@STEP_LOG_LINE@testGotQueryParams@File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_measurement.py",
line 54, in _RunTest@@@
@@@STEP_LOG_LINE@testGotQueryParams@self.MeasurePage(page, tab, results)@@@
@@@STEP_LOG_LINE@testGotQueryParams@File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_measurement_unittest.py",
line 44, in MeasurePage@@@
@@@STEP_LOG_LINE@testGotQueryParams@assert query.strip() == '?foo=1'@@@
@@@STEP_LOG_LINE@testGotQueryParams@AssertionError@@@
@@@STEP_LOG_LINE@testGotQueryParams@@@@
@@@STEP_LOG_END@testGotQueryParams@@@
@@@STEP_FAILURE@@@
@@@STEP_TEXT@telemetry_unittests@@@
@@@STEP_TEXT@failed 1@@@

[Vitaly Buka (NO REVIEWS), 2013-09-10 09:02:20]

[ RUN      ] PageMeasurementUnitTest.testFailure
WARNING:root:file:///blank.html:
Traceback (most recent call last):
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 395, in _RunPage
    test.Run(finder_options, page, tab, results)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_test.py",
line 176, in Run
    self._test_method(page, tab, results)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_measurement.py",
line 54, in _RunTest
    self.MeasurePage(page, tab, results)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_measurement_unittest.py",
line 19, in MeasurePage
    raise page_measurement.MeasurementFailure('Intentional failure.')
MeasurementFailure: Intentional failure.

[       OK ] PageMeasurementUnitTest.testFailure (943 ms)
[ RUN      ] PageMeasurementUnitTest.testGotQueryParams
Traceback (most recent call last):
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_measurement_unittest.py",
line 70, in testGotQueryParams
    all_results = self.RunMeasurement(measurement, ps, options=self._options)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_measurement_unittest_base.py",
line 48, in RunMeasurement
    return page_runner.Run(measurement, ps, expectations, options)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 286, in Run
    possible_browser, results, state)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 192, in _PrepareAndRunPage
    results_for_current_run, finder_options)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 395, in _RunPage
    test.Run(finder_options, page, tab, results)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_test.py",
line 176, in Run
    self._test_method(page, tab, results)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_measurement.py",
line 54, in _RunTest
    self.MeasurePage(page, tab, results)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_measurement_unittest.py",
line 44, in MeasurePage
    assert query.strip() == '?foo=1'
AssertionError

[  FAILED  ] PageMeasurementUnitTest.testGotQueryParams (1006 ms)
[ RUN      ] PageMeasurementUnitTest.testGotToBlank
[       OK ] PageMeasurementUnitTest.testGotToBlank (946 ms)
[----------] 5 tests (4806 ms total)

[----------] 8 tests
[ RUN      ] PageRunnerTests.testBrowserBeforeLaunch
[       OK ] PageRunnerTests.testBrowserBeforeLaunch (1005 ms)
[ RUN      ] PageRunnerTests.testCredentialsWhenLoginFails
WARNING:root:file:///blank.html:
Traceback (most recent call last):
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 391, in _RunPage
    page_state.PreparePage(page, tab, test)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 122, in PreparePage
    raise page_test.Failure('Login as ' + page.credentials + ' failed')
Failure: Login as test failed

[       OK ] PageRunnerTests.testCredentialsWhenLoginFails (557 ms)
[ RUN      ] PageRunnerTests.testCredentialsWhenLoginSucceeds
[       OK ] PageRunnerTests.testCredentialsWhenLoginSucceeds (934 ms)
[ RUN      ] PageRunnerTests.testDiscardFirstResult
[       OK ] PageRunnerTests.testDiscardFirstResult (5508 ms)
[ RUN      ] PageRunnerTests.testHandlingOfCrashedTab
ERROR:root:chrome://crash:
Traceback (most recent call last):
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 394, in _RunPage
    page_state.ImplicitPageNavigation(page, tab, test)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 136, in ImplicitPageNavigation
    test.RunNavigateSteps(page, tab)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_test.py",
line 216, in RunNavigateSteps
    self._RunCompoundAction(page, tab, navigate_actions, False)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_test.py",
line 195, in _RunCompoundAction
    action.RunAction(page, tab, prev_action)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/actions/navigate.py",
line 19, in RunAction
    tab.Navigate(target_side_url, page.script_to_evaluate_on_commit)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/tab.py",
line 93, in Navigate
    self._inspector_backend.Navigate(url, script_to_evaluate_on_commit, timeout)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py",
line 180, in Navigate
    self._page.Navigate(url, script_to_evaluate_on_commit, timeout)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_page.py",
line 96, in Navigate
    self.PerformActionAndWaitForNavigate(DoNavigate, timeout)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_page.py",
line 62, in PerformActionAndWaitForNavigate
    util.WaitFor(IsNavigationDone, timeout, pass_time_left_to_func=True)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/util.py",
line 49, in WaitFor
    res = condition(max((start_time + timeout) - time.time(), 0.0))
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_page.py",
line 60, in IsNavigationDone
    self._inspector_backend.DispatchNotifications(time_left)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py",
line 227, in DispatchNotifications
    self._HandleNotification(res)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py",
line 235, in _HandleNotification
    raise exceptions.TabCrashException()
TabCrashException

WARNING:root:minidump_stackwalk binary not found. Must build it to symbolize
crash dumps. Returning browser stdout.
WARNING:root:Tab crashed: chrome://crash
Stack Trace:
********************************************************************************
	
********************************************************************************
[       OK ] PageRunnerTests.testHandlingOfCrashedTab (741 ms)
[ RUN      ] PageRunnerTests.testHandlingOfCrashedTabWithExpectedFailure
ERROR:root:chrome://crash:
Traceback (most recent call last):
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 394, in _RunPage
    page_state.ImplicitPageNavigation(page, tab, test)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_runner.py",
line 136, in ImplicitPageNavigation
    test.RunNavigateSteps(page, tab)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_test.py",
line 216, in RunNavigateSteps
    self._RunCompoundAction(page, tab, navigate_actions, False)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/page_test.py",
line 195, in _RunCompoundAction
    action.RunAction(page, tab, prev_action)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/page/actions/navigate.py",
line 19, in RunAction
    tab.Navigate(target_side_url, page.script_to_evaluate_on_commit)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/tab.py",
line 93, in Navigate
    self._inspector_backend.Navigate(url, script_to_evaluate_on_commit, timeout)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py",
line 180, in Navigate
    self._page.Navigate(url, script_to_evaluate_on_commit, timeout)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_page.py",
line 96, in Navigate
    self.PerformActionAndWaitForNavigate(DoNavigate, timeout)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_page.py",
line 62, in PerformActionAndWaitForNavigate
    util.WaitFor(IsNavigationDone, timeout, pass_time_left_to_func=True)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/util.py",
line 49, in WaitFor
    res = condition(max((start_time + timeout) - time.time(), 0.0))
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_page.py",
line 60, in IsNavigationDone
    self._inspector_backend.DispatchNotifications(time_left)
  File
"/Volumes/data/b/build/slave/Mac10_6_Tests__3_/build/src/tools/telemetry/telemetry/core/backends/chrome/inspector_backend.py",
line 227, in DispatchNotifications

[achuithb, 2013-09-10 10:31:32]

I don't think this CL is the culprit.

[Vitaly Buka (NO REVIEWS), 2013-09-10 16:44:24]

On 2013/09/10 10:31:32, achuith.bhandarkar wrote:
> I don't think this CL is the culprit.

Sorry. I see now.
In such cases you can just revert my revert to avoid waiting in commit queue.