From 8bdb5817d4beb8f2bd625f7df4990f544fa4ac3a Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Mon, 8 Sep 2014 10:17:52 +0200 Subject: [PATCH] Backed out changeset cfeccb9028a9 (bug 1062611) for dt-test failures --- browser/devtools/webide/test/browser.ini | 2 +- browser/devtools/webide/test/browser_tabs.js | 18 ++++++++---------- browser/devtools/webide/test/doc_tabs.html | 15 --------------- browser/devtools/webide/test/head.js | 5 ----- 4 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 browser/devtools/webide/test/doc_tabs.html diff --git a/browser/devtools/webide/test/browser.ini b/browser/devtools/webide/test/browser.ini index 28594a69bb6..a31e8822933 100644 --- a/browser/devtools/webide/test/browser.ini +++ b/browser/devtools/webide/test/browser.ini @@ -2,8 +2,8 @@ subsuite = devtools support-files = addons/simulators.json - doc_tabs.html head.js templates.json [browser_tabs.js] +skip-if = true # Fails on TBPL, to be fixed in bug 1062611 diff --git a/browser/devtools/webide/test/browser_tabs.js b/browser/devtools/webide/test/browser_tabs.js index 1b9883455b8..4e57ee007b2 100644 --- a/browser/devtools/webide/test/browser_tabs.js +++ b/browser/devtools/webide/test/browser_tabs.js @@ -2,8 +2,6 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; -const TEST_URI = "http://example.com/browser/browser/devtools/webide/test/doc_tabs.html"; - function test() { waitForExplicitFinish(); SimpleTest.requestCompleteLog(); @@ -11,12 +9,10 @@ function test() { Task.spawn(function() { const { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}); - if (!DebuggerServer.initialized) { - DebuggerServer.init(function () { return true; }); - DebuggerServer.addBrowserActors(); - } + DebuggerServer.init(function () { return true; }); + DebuggerServer.addBrowserActors(); - let tab = yield addTab(TEST_URI); + let tab = yield addTab("about:newtab"); let win = yield openWebIDE(); @@ -27,13 +23,15 @@ function test() { yield selectTabProject(win); let project = win.AppManager.selectedProject; - is(project.location, TEST_URI, "Location is correct"); - is(project.name, "example.com: Test Tab", "Name is correct"); + is(project.location, "about:newtab", "Location is correct"); + is(project.name, "New Tab", "Name is correct"); yield closeWebIDE(win); DebuggerServer.destroy(); yield removeTab(tab); - }).then(finish, handleError); + + finish(); + }); } function connectToLocal(win) { diff --git a/browser/devtools/webide/test/doc_tabs.html b/browser/devtools/webide/test/doc_tabs.html deleted file mode 100644 index 4901289fc78..00000000000 --- a/browser/devtools/webide/test/doc_tabs.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - Test Tab - - - - Test Tab - - - diff --git a/browser/devtools/webide/test/head.js b/browser/devtools/webide/test/head.js index eff32d4bc6b..a583b763647 100644 --- a/browser/devtools/webide/test/head.js +++ b/browser/devtools/webide/test/head.js @@ -153,8 +153,3 @@ function removeTab(aTab, aWindow) { targetBrowser.removeTab(aTab); return deferred.promise; } - -function handleError(aError) { - ok(false, "Got an error: " + aError.message + "\n" + aError.stack); - finish(); -}