summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 23:06:01 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 23:06:01 +0000
commitfaa959294b43505bc6f3a277984f43cae02e3399 (patch)
tree41bd3357429840b803e4ecef2ed9f3c7aad24cde
parentb596f789a6d3b8ca4609fd67587e7db715e3d8ca (diff)
downloadchromium_src-faa959294b43505bc6f3a277984f43cae02e3399.zip
chromium_src-faa959294b43505bc6f3a277984f43cae02e3399.tar.gz
chromium_src-faa959294b43505bc6f3a277984f43cae02e3399.tar.bz2
Attempt to fix UI tests on chromeos
BUG=chromium-os:25368 TEST=fix ChromiumOS x86 bot on chromium.chromiumos waterfall R=piman@chromium.org Review URL: https://chromiumcodereview.appspot.com/9284002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118756 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xchrome/test/pyautolib/pyauto.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index da9af3e..5018850 100755
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -198,7 +198,8 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
# Sometimes flash files loaded too quickly after firing browser
# ends up getting downloaded, which seems to indicate that the plugin
# hasn't been registered yet.
- self.GetPluginsInfo()
+ if not self.IsChromeOS():
+ self.GetPluginsInfo()
# TODO(dtu): Remove this after crosbug.com/4558 is fixed.
if self.IsChromeOS():