userscripts/user-script-*-document.html tests are flaky on Windows

https://bugs.webkit.org/show_bug.cgi?id=45980 Reviewed by Eric Carlson. We can't use counting.mp4 as our video file to create a video document, because on Windows counting.mp4 is opened in Windows Explorer or Quicktime instead of Safari. This bug is being tracked by <https://bugs.webkit.org/show_bug.cgi?id=25220>. This patch switches user-script-video-document.html to use silence-loop.mov instead of counting.mp4, which creates a video document on both Mac and Windows. * userscripts/resources/counting.mp4: Removed. * userscripts/resources/silence-loop.mov: Added. * userscripts/user-script-video-document-expected.txt: * userscripts/user-script-video-document.html: Canonical link: https://commits.webkit.org/61920@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@71433 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Nov 5, 2010 · 16fc74392734fd17061dd3dcd5a5cae2a3bc8159 · 16fc743
1 parent b5562bc
commit 16fc74392734fd17061dd3dcd5a5cae2a3bc8159
Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-05  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Eric Carlson.
+
+        userscripts/user-script-*-document.html tests are flaky on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=45980
+
+        We can't use counting.mp4 as our video file to create a video document, because on Windows counting.mp4
+        is opened in Windows Explorer or Quicktime instead of Safari. This bug is being tracked by 
+        <https://bugs.webkit.org/show_bug.cgi?id=25220>.
+
+        This patch switches user-script-video-document.html to use silence-loop.mov instead of counting.mp4,
+        which creates a video document on both Mac and Windows.
+
+        * userscripts/resources/counting.mp4: Removed.
+        * userscripts/resources/silence-loop.mov: Added.
+        * userscripts/user-script-video-document-expected.txt:
+        * userscripts/user-script-video-document.html:
+
 2010-11-05  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Adam Roben.

diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
@@ -1007,10 +1007,6 @@ userscripts/user-script-top-frame-only.html
 userscripts/user-style-all-frames.html
 userscripts/user-style-top-frame-only.html
 
-# These tests are flaky on Windows. Needs investigation.
-# https://bugs.webkit.org/show_bug.cgi?id=45980
-userscripts/user-script-video-document.html
-
 # Directory upload is not enabled.
 fast/forms/input-file-directory-upload.html
 

diff --git a/LayoutTests/userscripts/resources/counting.mp4 b/LayoutTests/userscripts/resources/counting.mp4
diff --git a/LayoutTests/userscripts/resources/silence-loop.mov b/LayoutTests/userscripts/resources/silence-loop.mov
diff --git a/LayoutTests/userscripts/user-script-video-document-expected.txt b/LayoutTests/userscripts/user-script-video-document-expected.txt
@@ -1,4 +1,4 @@
 CONSOLE MESSAGE: line 1: End Script: user-script-video-document.html
-CONSOLE MESSAGE: line 1: Start Script: counting.mp4
-CONSOLE MESSAGE: line 1: End Script: counting.mp4
+CONSOLE MESSAGE: line 1: Start Script: silence-loop.mov
+CONSOLE MESSAGE: line 1: End Script: silence-loop.mov
 
diff --git a/LayoutTests/userscripts/user-script-video-document.html b/LayoutTests/userscripts/user-script-video-document.html
@@ -9,6 +9,6 @@
 </script>
 </head>
 <body>
-<iframe src="resources/counting.mp4"></iframe>
+<iframe src="resources/silence-loop.mov"></iframe>
 </body>
 </html>