Bug 972110 - fix test_bug674770-1.html after merge conflict a=me
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 23 Sep 2016 12:14:13 +0200
changeset 357896 60cc643978c7020926fe4145761e26945fcd5c37
parent 357895 9eae36f83dbae7434e74cd9c689a965031778370
child 357897 164b6355c46a80af32a76a7a3c37a55457c5c936
child 357904 dad39cae4473549bdf2677997f268541559a9b55
child 357963 2e46d0c12db68401969a817832329187da8add06
child 357980 c4d91d17c8ed2e385f4a4a3d97f861eee722626f
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-beta@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs972110, 674770
milestone52.0a1
first release with
nightly linux32
60cc643978c7 / 52.0a1 / 20160924030427 / files
nightly linux64
60cc643978c7 / 52.0a1 / 20160924030427 / files
nightly mac
60cc643978c7 / 52.0a1 / 20160924030427 / files
nightly win32
60cc643978c7 / 52.0a1 / 20160924030427 / files
nightly win64
60cc643978c7 / 52.0a1 / 20160924030427 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 972110 - fix test_bug674770-1.html after merge conflict a=me
editor/libeditor/tests/test_bug674770-1.html
--- a/editor/libeditor/tests/test_bug674770-1.html
+++ b/editor/libeditor/tests/test_bug674770-1.html
@@ -37,27 +37,22 @@ function startTests() {
       linkShouldWork: false },
   ];
   var currentTest;
   function runNextTest() {
     localStorage.removeItem("clicked");
     currentTest = tests.shift();
     if (!currentTest) {
       SimpleTest.finish();
-<<<<<<< local
       return;
     }
     ok(true, currentTest.description + "Starting to test...");
     synthesizeMouseAtCenter(currentTest.target(), { button: 1 });
   }
-=======
-    }, 500);
-  }, 500);
-}
->>>>>>> other
+
 
   addEventListener("storage", function(e) {
     is(e.key, "clicked", currentTest.description + "Key should always be 'clicked'");
     is(e.newValue, "true", currentTest.description + "Value should always be 'true'");
     ok(currentTest.linkShouldWork, currentTest.description + "The click operation on the link " + (currentTest.linkShouldWork ? "should work" : "shouldn't work"));
     SimpleTest.executeSoon(runNextTest);
   }, false);