diff options
| author | kelvinp <kelvinp@chromium.org> | 2016-02-01 15:55:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-01 23:57:10 +0000 |
| commit | 09fd68866e3c016bd0f0ffca096039a22e235a60 (patch) | |
| tree | 1ac04997bd95564cd68895b70a8177abbc1bda54 /remoting/remoting_webapp_files.gypi | |
| parent | 809dc5d993e19b5b3784efed496e4d50c0510c44 (diff) | |
| download | chromium_src-09fd68866e3c016bd0f0ffca096039a22e235a60.zip chromium_src-09fd68866e3c016bd0f0ffca096039a22e235a60.tar.gz chromium_src-09fd68866e3c016bd0f0ffca096039a22e235a60.tar.bz2 | |
Fix broken 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.
This CL also fixes a bug in our GN dependency declaration.
BUG=582005
Review URL: https://codereview.chromium.org/1653443002
Cr-Commit-Position: refs/heads/master@{#372825}
Diffstat (limited to 'remoting/remoting_webapp_files.gypi')
| -rw-r--r-- | remoting/remoting_webapp_files.gypi | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi index 9e3e1fb..cab6a2a 100644 --- a/remoting/remoting_webapp_files.gypi +++ b/remoting/remoting_webapp_files.gypi @@ -80,9 +80,6 @@ ], # The unit test cases for the webapp 'remoting_webapp_unittests_js_files': [ - # TODO(jrw): Move spy_promise to base. - 'webapp/unittests/spy_promise.js', - 'webapp/unittests/spy_promise_unittest.js', 'webapp/base/js/base_unittest.js', 'webapp/base/js/base_event_hook_unittest.js', 'webapp/base/js/base_inherits_unittest.js', |