summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsimonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-08 20:50:54 +0000
committersimonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-08 20:50:54 +0000
commit89e4d104837385b0a4ca422fbb769a97d08901b4 (patch)
tree8388e730e7221b69707c4230913e077d16905940 /chrome
parent281ba5a6338a02e6391c772a536a2fadb8eed634 (diff)
downloadchromium_src-89e4d104837385b0a4ca422fbb769a97d08901b4.zip
chromium_src-89e4d104837385b0a4ca422fbb769a97d08901b4.tar.gz
chromium_src-89e4d104837385b0a4ca422fbb769a97d08901b4.tar.bz2
[Chromoting] Run the chromoting PyAuto test on CONTINUOUS, but not on FULL.
BUG=126278 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10377047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/functional/PYAUTO_TESTS9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index 0e6ece3..cf38893 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -40,6 +40,7 @@
'bookmarks',
'browser',
'browsing_data',
+ 'chromoting_basic',
'codesign',
'content',
'cookies',
@@ -307,6 +308,8 @@
# ===========================
# You cannot resize the browser window on ChromeOS.
'-browser.BrowserTest.testWindowResize',
+ # ChromeOS doesn't yet support the chromoting host.
+ '-chromoting_basic',
# No codesign verification on ChromeOS.
'-codesign',
# Import tests are invalid on ChromeOS since Chrome is the only browser.
@@ -482,6 +485,12 @@
'nacl_sdk',
'translate',
+ # ===========================
+ # Permanently-disabled tests.
+ # ===========================
+ # The chromoting webapp isn't currently available when FULL is run.
+ '-chromoting_basic',
+
# ==================================================
# Disabled tests that need to be investigated/fixed.
# ==================================================