summaryrefslogtreecommitdiffstats
path: root/remoting/webapp/files.gni
diff options
context:
space:
mode:
authorkelvinp <kelvinp@chromium.org>2016-01-26 16:23:43 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-27 00:24:58 +0000
commitaeb109ffd9b79927edb6a75f8cef7e72792fb356 (patch)
tree8e972f5906475a46ec8ce3d777bb03f4103d97f3 /remoting/webapp/files.gni
parent059e24c0c596ae9d958f82e93a3b458b25677ef5 (diff)
downloadchromium_src-aeb109ffd9b79927edb6a75f8cef7e72792fb356.zip
chromium_src-aeb109ffd9b79927edb6a75f8cef7e72792fb356.tar.gz
chromium_src-aeb109ffd9b79927edb6a75f8cef7e72792fb356.tar.bz2
Fix flaky remoting webapp javascript unittest.
After forcing tests to fail after a 10 seconds timeout, turns out the spy promise tests are the culprit. I have removed them from our tests as they are originally intended to test XHR's and we now have a better API for that. BUG=504204 Review URL: https://codereview.chromium.org/1633273002 Cr-Commit-Position: refs/heads/master@{#371658}
Diffstat (limited to 'remoting/webapp/files.gni')
-rw-r--r--remoting/webapp/files.gni3
1 files changed, 0 insertions, 3 deletions
diff --git a/remoting/webapp/files.gni b/remoting/webapp/files.gni
index 0b56868..7f43734 100644
--- a/remoting/webapp/files.gni
+++ b/remoting/webapp/files.gni
@@ -77,9 +77,6 @@ remoting_webapp_unittests_exclude_js_files = [
# The unit test cases for the webapp
remoting_webapp_unittests_js_files = [
- # TODO(jrw): Move spy_promise to base.
- "unittests/spy_promise.js",
- "unittests/spy_promise_unittest.js",
"base/js/base_unittest.js",
"base/js/base_event_hook_unittest.js",
"base/js/base_inherits_unittest.js",