summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornednguyen <nednguyen@google.com>2014-11-04 17:38:55 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-05 01:39:15 +0000
commit846e3acdac98204b61f6cec9624e6ed3d52b6491 (patch)
tree5839c96f6cd9f57e290b86d15bced9e6eebf4ee4
parentd42e0915a0b2691cf481fa39fe8174ae05363901 (diff)
downloadchromium_src-846e3acdac98204b61f6cec9624e6ed3d52b6491.zip
chromium_src-846e3acdac98204b61f6cec9624e6ed3d52b6491.tar.gz
chromium_src-846e3acdac98204b61f6cec9624e6ed3d52b6491.tar.bz2
Set android_browser_finder.psutil to None in tools/telemetry/telemetry/core/backends/chrome/android_browser_finder_unittest.py to avoid flakiness
BUG=426604 Review URL: https://codereview.chromium.org/667423003 Cr-Commit-Position: refs/heads/master@{#302736}
-rw-r--r--tools/telemetry/telemetry/core/backends/chrome/android_browser_finder_unittest.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder_unittest.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder_unittest.py
index f180e31..fc86326 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder_unittest.py
@@ -21,11 +21,14 @@ class AndroidBrowserFinderTest(unittest.TestCase):
android_device, ['adb_commands'])
self._apb_stub = system_stub.Override(
android_platform_backend, ['adb_commands'])
+ self._actual_ps_util = android_browser_finder.psutil
+ android_browser_finder.psutil = None
def tearDown(self):
self._stubs.Restore()
self._android_device_stub.Restore()
self._apb_stub.Restore()
+ android_browser_finder.psutil = self._actual_ps_util
def test_no_adb(self):
finder_options = browser_options.BrowserFinderOptions()