Backed out changeset cfeccb9028a9 (bug 1062611) for dt-test failures

This commit is contained in:
Carsten "Tomcat" Book 2014-09-08 10:17:52 +02:00
parent 7fc83e6d8a
commit 8bdb5817d4
4 changed files with 9 additions and 31 deletions

View File

@ -2,8 +2,8 @@
subsuite = devtools subsuite = devtools
support-files = support-files =
addons/simulators.json addons/simulators.json
doc_tabs.html
head.js head.js
templates.json templates.json
[browser_tabs.js] [browser_tabs.js]
skip-if = true # Fails on TBPL, to be fixed in bug 1062611

View File

@ -2,8 +2,6 @@
http://creativecommons.org/publicdomain/zero/1.0/ */ http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict"; "use strict";
const TEST_URI = "http://example.com/browser/browser/devtools/webide/test/doc_tabs.html";
function test() { function test() {
waitForExplicitFinish(); waitForExplicitFinish();
SimpleTest.requestCompleteLog(); SimpleTest.requestCompleteLog();
@ -11,12 +9,10 @@ function test() {
Task.spawn(function() { Task.spawn(function() {
const { DebuggerServer } = const { DebuggerServer } =
Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}); Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
if (!DebuggerServer.initialized) { DebuggerServer.init(function () { return true; });
DebuggerServer.init(function () { return true; }); DebuggerServer.addBrowserActors();
DebuggerServer.addBrowserActors();
}
let tab = yield addTab(TEST_URI); let tab = yield addTab("about:newtab");
let win = yield openWebIDE(); let win = yield openWebIDE();
@ -27,13 +23,15 @@ function test() {
yield selectTabProject(win); yield selectTabProject(win);
let project = win.AppManager.selectedProject; let project = win.AppManager.selectedProject;
is(project.location, TEST_URI, "Location is correct"); is(project.location, "about:newtab", "Location is correct");
is(project.name, "example.com: Test Tab", "Name is correct"); is(project.name, "New Tab", "Name is correct");
yield closeWebIDE(win); yield closeWebIDE(win);
DebuggerServer.destroy(); DebuggerServer.destroy();
yield removeTab(tab); yield removeTab(tab);
}).then(finish, handleError);
finish();
});
} }
function connectToLocal(win) { function connectToLocal(win) {

View File

@ -1,15 +0,0 @@
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
<!doctype html>
<html>
<head>
<meta charset="utf-8"/>
<title>Test Tab</title>
</head>
<body>
Test Tab
</body>
</html>

View File

@ -153,8 +153,3 @@ function removeTab(aTab, aWindow) {
targetBrowser.removeTab(aTab); targetBrowser.removeTab(aTab);
return deferred.promise; return deferred.promise;
} }
function handleError(aError) {
ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
finish();
}