diff options
| author | miu <miu@chromium.org> | 2014-11-10 15:47:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-10 23:48:03 +0000 |
| commit | ce20264786c12e8e3f6fcb448492c80cb07d0f4e (patch) | |
| tree | 3e558ba32624e76c98ddee171026a2269fcb93ce | |
| parent | e9621cf1555461596595ad892bc62ec8630382c6 (diff) | |
| download | chromium_src-ce20264786c12e8e3f6fcb448492c80cb07d0f4e.zip chromium_src-ce20264786c12e8e3f6fcb448492c80cb07d0f4e.tar.gz chromium_src-ce20264786c12e8e3f6fcb448492c80cb07d0f4e.tar.bz2 | |
Re-enable CastStreamingApiTestWithPixelOutput.EndToEnd for CrOS.
Seems to work reliably now. Assuming an external issue was resolved,
and re-enabling this test for the CrOS bots.
Also, tweaked a minor (but as-yet unforeseen) race condition that
could cause the JavaScript to fail if the body of the page was not
yet loaded.
BUG=396413
Review URL: https://codereview.chromium.org/708183002
Cr-Commit-Position: refs/heads/master@{#303538}
| -rw-r--r-- | chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc | 9 | ||||
| -rw-r--r-- | chrome/test/data/extensions/api_test/cast_streaming/end_to_end_sender.html | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc index 69c35d4..6b27078 100644 --- a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc +++ b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc @@ -333,12 +333,9 @@ class CastStreamingApiTestWithPixelOutput : public CastStreamingApiTest { // in-process Cast receiver, listening on a localhost UDP socket, to receive the // content and check whether it matches expectations. // -// TODO(miu): In order to get this test up-and-running again, we will first -// confirm it is stable on Release build bots, then later we will enable it for -// the Debug build bots. http://crbug.com/396413 -// Also, it seems that the test fails to generate any video (audio is fine) on -// the ChromeOS bot. Need to root-cause and resolve that issue. -#if defined(NDEBUG) && !defined(OS_CHROMEOS) +// TODO(miu): Now that this test has been long-stable on Release build bots, it +// should be enabled for the Debug build bots. http://crbug.com/396413 +#if defined(NDEBUG) #define MAYBE_EndToEnd EndToEnd #else #define MAYBE_EndToEnd DISABLED_EndToEnd diff --git a/chrome/test/data/extensions/api_test/cast_streaming/end_to_end_sender.html b/chrome/test/data/extensions/api_test/cast_streaming/end_to_end_sender.html index 190d577..e444ed0 100644 --- a/chrome/test/data/extensions/api_test/cast_streaming/end_to_end_sender.html +++ b/chrome/test/data/extensions/api_test/cast_streaming/end_to_end_sender.html @@ -1,7 +1,5 @@ <html> -<head> -<script src="end_to_end_sender.js"></script> -</head> <body> </body> +<script src="end_to_end_sender.js"></script> </html> |