Android: removes old "keep_test_server_ports".

Android: removes old "keep_test_server_ports".

This option is no longer in use, clean it up.

BUG=

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

[bulach, 2013-11-15 13:49:10]

part of the perf tests unification, ptal..

[tonyg, 2013-11-15 15:29:55]

lgtm

https://codereview.chromium.org/68263025/diff/1/tools/telemetry/telemetry/cor...
File tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
(right):

https://codereview.chromium.org/68263025/diff/1/tools/telemetry/telemetry/cor...
tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py:205: #
to run for longer before it hangs.
Let's update this comment. Something along the lines of

Killing adbd before running tests has proven to make them less likely to flake
out during the test. We skip this if Telemetry is running under a buildbot
because they do it for us.

[bulach, 2013-11-15 16:06:16]

thanks tony! addressed..

https://codereview.chromium.org/68263025/diff/1/tools/telemetry/telemetry/cor...
File tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
(right):

https://codereview.chromium.org/68263025/diff/1/tools/telemetry/telemetry/cor...
tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py:205: #
to run for longer before it hangs.
On 2013/11/15 15:29:55, tonyg wrote:
> Let's update this comment. Something along the lines of
> 
> Killing adbd before running tests has proven to make them less likely to flake
> out during the test. We skip this if Telemetry is running under a buildbot
> because they do it for us.

good point! refreshed both comments blocks, let me know if it's clearer.

[tonyg, 2013-11-15 16:14:15]

lgtm

[frankf, 2013-11-15 18:43:29]

https://codereview.chromium.org/68263025/diff/60001/build/android/test_runner.py
File build/android/test_runner.py (right):

https://codereview.chromium.org/68263025/diff/60001/build/android/test_runner...
build/android/test_runner.py:200: if not ports.ResetTestServerPortAllocation():
Can you unify all such calls into one? gtest/setup.py and perf/setup.py have
identical statements.

[bulach, 2013-11-15 18:56:32]

https://codereview.chromium.org/68263025/diff/60001/build/android/test_runner.py
File build/android/test_runner.py (right):

https://codereview.chromium.org/68263025/diff/60001/build/android/test_runner...
build/android/test_runner.py:200: if not ports.ResetTestServerPortAllocation():
On 2013/11/15 18:43:30, frankf wrote:
> Can you unify all such calls into one? gtest/setup.py and perf/setup.py have
> identical statements.

good point! done.

[frankf, 2013-11-15 19:00:00]

Nice cleanup. lgtm.

[frankf, 2013-11-15 19:01:31]

On 2013/11/15 19:00:00, frankf wrote:
> Nice cleanup. lgtm.

oh, don't forget downstream json files :)

[Primiano Tucci (use gerrit), 2013-11-20 06:45:30]

Cleanup, nice! LGTM

[commit-bot: I haz the power, 2013-11-21 13:39:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bulach@chromium.org/68263025/120001

[commit-bot: I haz the power, 2013-11-21 13:39:13]

Failed to apply patch for
tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
  Hunk #1 FAILED at 198.
  1 out of 1 hunk FAILED -- saving rejects to file
tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py.rej

Patch:      
tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
diff --git
a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
index
f956cedb4bbe931909a7d025754f823a49cfb28a..9686d5b89cb4aae4c8441d60a058463a096c2546
100644
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
@@ -198,14 +198,11 @@ def FindAllAvailableBrowsers(finder_options,
logging=real_logging):
         if ret:
           logging.warn('Failed to taskset %d (%s)', pid, ret)
 
-    # Experimental device side workaround for crbug.com/268450 (adb
instability)
-    # The /sbin/adbd process on the device appears to hang which causes adb to
-    # report that the device is offline. Our working theory is that killing
-    # the process and allowing it to be automatically relaunched will allow us
-    # to run for longer before it hangs.
-    if not finder_options.keep_test_server_ports:
-      # This would break forwarder connections, so we cannot do this if
-      # instructed to keep server ports open.
+    if not os.environ.get('BUILDBOT_BUILDERNAME'):
+      # Killing adbd before running tests has proven to make them less likely
to
+      # flake out during the test. We skip this if Telemetry is running under a
+      # buildbot because build/android/test_runner.py wrapper already took care
+      # of it before starting the shards.
       logging.info('Killing adbd on device')
       adb.KillAll('adbd')
       logging.info('Waiting for adbd to restart')

[commit-bot: I haz the power, 2013-11-21 14:24:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bulach@chromium.org/68263025/260001

[commit-bot: I haz the power, 2013-11-21 16:18:46]

Change committed as 236533