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 /chrome | |
| 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 'chrome')
| -rw-r--r-- | chrome/test/remoting/webapp_javascript_unittest.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/test/remoting/webapp_javascript_unittest.cc b/chrome/test/remoting/webapp_javascript_unittest.cc index d04f261..f8b2e68 100644 --- a/chrome/test/remoting/webapp_javascript_unittest.cc +++ b/chrome/test/remoting/webapp_javascript_unittest.cc @@ -12,11 +12,16 @@ namespace remoting { -// Flakily times out on Win7 Tests (dbg) and Linux Tests (dbg)(1): -// https://crbug.com/504204. Recently completely broken on -// Linux: https://crbug.com/582005 +// Disable test on (dbg) as it takes longer than 30s to complete. +// https://crbug.com/504204. +#if (!defined(NDEBUG)) +#define MAYBE_Remoting_Webapp_Js_Unittest DISABLED_Remoting_Webapp_Js_Unittest +#else +#define MAYBE_Remoting_Webapp_Js_Unittest Remoting_Webapp_Js_Unittest +#endif + IN_PROC_BROWSER_TEST_F(QUnitBrowserTestRunner, - DISABLED_Remoting_Webapp_Js_Unittest) { + MAYBE_Remoting_Webapp_Js_Unittest) { base::FilePath base_dir; ASSERT_TRUE(PathService::Get(base::DIR_EXE, &base_dir)); |