Bug 863748 - Move some misc. test files down in ./res, and disable metro plugin tests due to timeouts. r=mbrubeck
authorJim Mathies <jmathies@mozilla.com>
Tue, 23 Apr 2013 16:44:07 -0500
changeset 140636 4dab39869e57dc37c8ebb86b2628f035aebc33e1
parent 140635 5ad359f31b905b8020940c25622436d3ab3c3a0d
child 140637 d51a9c4ebf3aa110c361f19834b4006b3dd7968c
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbrubeck
bugs863748
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 863748 - Move some misc. test files down in ./res, and disable metro plugin tests due to timeouts. r=mbrubeck
browser/metro/base/tests/mochitest/Makefile.in
browser/metro/base/tests/mochitest/browser_context_menu_tests_03.html
browser/metro/base/tests/mochitest/browser_selection_frame_content.html
browser/metro/base/tests/mochitest/res/textblock01.html
browser/metro/base/tests/mochitest/text-block.html
--- a/browser/metro/base/tests/mochitest/Makefile.in
+++ b/browser/metro/base/tests/mochitest/Makefile.in
@@ -16,44 +16,46 @@ BROWSER_TESTS = \
   browser_canonizeURL.js \
   browser_context_ui.js \
   browser_tiles.js \
   browser_tilegrid.xul \
   browser_onscreen_keyboard.js \
   browser_onscreen_keyboard.html \
   browser_remotetabs.js \
   browser_downloads.js \
-  browser_plugin_input.html \
-  browser_plugin_input_mouse.js \
-  browser_plugin_input_keyboard.js \
   browser_context_menu_tests.js \
   browser_context_menu_tests_01.html \
   browser_context_menu_tests_02.html \
   browser_context_menu_tests_03.html \
-  text-block.html \
   browser_prefs_ui.js \
   browser_topsites.js \
   browser_tabs.js \
   $(NULL)
 
+# disabled due to timeouts and lack of plugin support.
+#  browser_plugin_input.html \
+#  browser_plugin_input_mouse.js \
+#  browser_plugin_input_keyboard.js \
+
 ifndef MOZ_DEBUG
 BROWSER_TESTS += \
   browser_selection_basic.js \
   browser_selection_basic.html \
   browser_selection_textarea.js \
   browser_selection_textarea.html \
   browser_selection_frame_content.js \
   browser_selection_frame_content.html \
   browser_selection_inputs.js \
   browser_selection_inputs.html \
   $(NULL)
 endif
 
 BROWSER_TEST_RESOURCES = \
   res/image01.png \
+  res/textblock01.html \
   $(NULL)
 
 libs:: $(BROWSER_TESTS)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/metro/$(relativesrcdir)
 
 libs:: $(BROWSER_TEST_RESOURCES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/metro/$(relativesrcdir)/res
 
--- a/browser/metro/base/tests/mochitest/browser_context_menu_tests_03.html
+++ b/browser/metro/base/tests/mochitest/browser_context_menu_tests_03.html
@@ -4,17 +4,17 @@
 <meta charset="utf-8">
 </head>
 
 <body  bgcolor=white>
 
 Hello there. <a href="#hello">hello there.</a>
 <div style="margin-left: 280px;">
 
-<iframe id="frame1" width="800" height="600" src="text-block.html"></iframe>
+<iframe id="frame1" width="800" height="600" src="res/textblock01.html"></iframe>
 
 <br />
 <br />
 Hello there. <a id="rlink1" href="#hello">hello there.</a>
 <br />
 <br />
 <br />
 <br />
--- a/browser/metro/base/tests/mochitest/browser_selection_frame_content.html
+++ b/browser/metro/base/tests/mochitest/browser_selection_frame_content.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
   <head>
   </head>
 <body>
 <div>
-<iframe id="frame1" width="800" height="600" src="text-block.html"></iframe>
+<iframe id="frame1" width="800" height="600" src="res/textblock01.html"></iframe>
 <br />
 <br />
 Hello there. <a id="rlink1" href="#hello">Hi!</a>
 <br />
 <br />
 <br />
 <br />
 <br />
new file mode 100644
--- /dev/null
+++ b/browser/metro/base/tests/mochitest/res/textblock01.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+</head>
+<body>
+<div id="content">
+    <p>(start of paragraph)
+    Alice was beginning to get very (break)<br>
+    tired of sitting by her sister on the bank, and of having nothing to do: once or twice she (span)
+    <span>(start of span) had peeped into the book her sister was reading (end of span)</span>,
+    but it had no pictures or conversations in it, `and what is the use of a book,' thought Alice
+    `without pictures or conversation?' (break)<br> 
+    (end of paragraph)</p>
+    (in between paragraphs)
+    <p>(start of paragraph)
+    Alice was beginning to get very tired of sitting by her sister on the bank, and of having
+    nothing to do: once or twice she had peeped into the book her sister was reading, but it
+    had no pictures or conversations in it, `and what is the use of a book,' thought Alice
+    `without pictures or conversation?'(break)<br>
+    (end of paragraph)</p>
+
+    <p><a id="link1" href="#hello">(start of paragraph)</a>
+    So she was considering in her own mind (as well as she could, for the hot day made her
+    feel very sleepy and stupid), whether the pleasure of making a daisy-chain would be worth
+    the trouble of getting up and picking the daisies, when suddenly a White Rabbit with pink
+    eyes ran close by her. <br>
+    </p>
+
+    <p>
+    There was nothing so VERY remarkable in that; nor did Alice think it so VERY much out of
+    the way to hear the Rabbit say to itself, `Oh dear! Oh dear! I shall be late!' (when she
+    thought it over afterwards, it occurred to her that she ought to have wondered at this,
+    but at the time it all seemed quite natural); but when the Rabbit actually TOOK A WATCH
+    OUT OF ITS WAISTCOAT-POCKET, and looked at it, and then hurried on, Alice started to her
+    feet, for it flashed across her mind that she had never before seen a rabbit with either a
+    waistcoat-pocket, or a watch to take out of it, and burning with curiosity, she ran across
+    the field after it, and fortunately was just in time to see it pop down a large
+    rabbit-hole under the hedge. <br>
+    <br>
+    In another moment down went Alice after it, never once considering how in the world she
+    was to get out again. <br>
+    <br>
+    The rabbit-hole went straight on like a tunnel for some way, and then dipped suddenly
+    down, so suddenly that Alice had not a moment to think about stopping herself before she
+    found herself falling down a very deep well. <br>
+    <br><a id="link2" href="#hello">(start of paragraph)</a>
+    Either the well was very deep, or she fell very slowly, for she had plenty of time as she
+    went down to look about her and to wonder what was going to happen next. First, she tried
+    to look down and make out what she was coming to, but it was too dark to see anything;
+    then she looked at the sides of the well, and noticed that they were filled with cupboards
+    and book-shelves; here and there she saw maps and pictures hung upon pegs. She took down a
+    jar from one of the shelves as she passed; it was labelled `ORANGE MARMALADE', but to her
+    great disappointment it was empty: she did not like to drop the jar for fear of killing
+    somebody, so managed to put it into one of the cupboards as she fell past it. <br>
+    <br>
+    `Well!' thought Alice to herself, `after such a fall as this, I shall think nothing of
+    tumbling down stairs! How brave they'll all think me at home! Why, I wouldn't say anything
+    about it, even if I fell off the top of the house!' (Which was very likely true.) <br>
+    <br>
+    Down, down, down.
+    <br>
+</div>
+</body></html>
\ No newline at end of file
deleted file mode 100644
--- a/browser/metro/base/tests/mochitest/text-block.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-</head>
-<body>
-<div id="content">
-    <p>(start of paragraph)
-    Alice was beginning to get very (break)<br>
-    tired of sitting by her sister on the bank, and of having nothing to do: once or twice she (span)
-    <span>(start of span) had peeped into the book her sister was reading (end of span)</span>,
-    but it had no pictures or conversations in it, `and what is the use of a book,' thought Alice
-    `without pictures or conversation?' (break)<br> 
-    (end of paragraph)</p>
-    (in between paragraphs)
-    <p>(start of paragraph)
-    Alice was beginning to get very tired of sitting by her sister on the bank, and of having
-    nothing to do: once or twice she had peeped into the book her sister was reading, but it
-    had no pictures or conversations in it, `and what is the use of a book,' thought Alice
-    `without pictures or conversation?'(break)<br>
-    (end of paragraph)</p>
-
-    <p><a id="link1" href="#hello">(start of paragraph)</a>
-    So she was considering in her own mind (as well as she could, for the hot day made her
-    feel very sleepy and stupid), whether the pleasure of making a daisy-chain would be worth
-    the trouble of getting up and picking the daisies, when suddenly a White Rabbit with pink
-    eyes ran close by her. <br>
-    </p>
-
-    <p>
-    There was nothing so VERY remarkable in that; nor did Alice think it so VERY much out of
-    the way to hear the Rabbit say to itself, `Oh dear! Oh dear! I shall be late!' (when she
-    thought it over afterwards, it occurred to her that she ought to have wondered at this,
-    but at the time it all seemed quite natural); but when the Rabbit actually TOOK A WATCH
-    OUT OF ITS WAISTCOAT-POCKET, and looked at it, and then hurried on, Alice started to her
-    feet, for it flashed across her mind that she had never before seen a rabbit with either a
-    waistcoat-pocket, or a watch to take out of it, and burning with curiosity, she ran across
-    the field after it, and fortunately was just in time to see it pop down a large
-    rabbit-hole under the hedge. <br>
-    <br>
-    In another moment down went Alice after it, never once considering how in the world she
-    was to get out again. <br>
-    <br>
-    The rabbit-hole went straight on like a tunnel for some way, and then dipped suddenly
-    down, so suddenly that Alice had not a moment to think about stopping herself before she
-    found herself falling down a very deep well. <br>
-    <br><a id="link2" href="#hello">(start of paragraph)</a>
-    Either the well was very deep, or she fell very slowly, for she had plenty of time as she
-    went down to look about her and to wonder what was going to happen next. First, she tried
-    to look down and make out what she was coming to, but it was too dark to see anything;
-    then she looked at the sides of the well, and noticed that they were filled with cupboards
-    and book-shelves; here and there she saw maps and pictures hung upon pegs. She took down a
-    jar from one of the shelves as she passed; it was labelled `ORANGE MARMALADE', but to her
-    great disappointment it was empty: she did not like to drop the jar for fear of killing
-    somebody, so managed to put it into one of the cupboards as she fell past it. <br>
-    <br>
-    `Well!' thought Alice to herself, `after such a fall as this, I shall think nothing of
-    tumbling down stairs! How brave they'll all think me at home! Why, I wouldn't say anything
-    about it, even if I fell off the top of the house!' (Which was very likely true.) <br>
-    <br>
-    Down, down, down.
-    <br>
-</div>
-</body></html>
\ No newline at end of file