Bug 1446222 - Move websocket-server.js to socket dir. r=jdescottes
MozReview-Commit-ID: 9LZZXTKGCOb
--- a/devtools/server/moz.build
+++ b/devtools/server/moz.build
@@ -4,26 +4,26 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include('../templates.mozbuild')
DIRS += [
'actors',
'performance',
+ 'socket',
]
BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
DevToolsModules(
'child.js',
'content-process-debugger-server.js',
'content-server.jsm',
'main.js',
'service-worker-child.js',
- 'websocket-server.js',
'worker.js'
)
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Developer Tools')
new file mode 100644
--- /dev/null
+++ b/devtools/server/socket/moz.build
@@ -0,0 +1,11 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
+
+DevToolsModules(
+ 'websocket-server.js',
+)
new file mode 100644
--- /dev/null
+++ b/devtools/server/socket/tests/.eslintrc.js
@@ -0,0 +1,6 @@
+"use strict";
+
+module.exports = {
+ // Extend from the common devtools mochitest eslintrc config.
+ "extends": "../../../.eslintrc.xpcshell.js"
+};
new file mode 100644
--- /dev/null
+++ b/devtools/server/socket/tests/chrome.ini
@@ -0,0 +1,3 @@
+[DEFAULT]
+tags = devtools
+[test_websocket-server.html]
rename from devtools/server/tests/mochitest/test_websocket-server.html
rename to devtools/server/socket/tests/test_websocket-server.html
--- a/devtools/server/tests/mochitest/test_websocket-server.html
+++ b/devtools/server/socket/tests/test_websocket-server.html
@@ -9,17 +9,17 @@
</head>
<body>
<script>
"use strict";
window.onload = function() {
const CC = Components.Constructor;
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
- const WebSocketServer = require("devtools/server/websocket-server");
+ const WebSocketServer = require("devtools/server/socket/websocket-server");
const ServerSocket = CC("@mozilla.org/network/server-socket;1",
"nsIServerSocket", "init");
add_task(async function() {
// Create a TCP server on auto-assigned port
let server = new ServerSocket(-1, true, -1);
ok(server, `Launched WebSocket server on port ${server.port}`);
rename from devtools/server/websocket-server.js
rename to devtools/server/socket/websocket-server.js
--- a/devtools/server/tests/mochitest/chrome.ini
+++ b/devtools/server/tests/mochitest/chrome.ini
@@ -104,9 +104,8 @@ skip-if = !stylo # No shadow dom support
[test_styles-modify.html]
[test_styles-svg.html]
[test_unsafeDereference.html]
[test_webconsole-node-grip.html]
[test_webextension-addon-debugging-connect.html]
skip-if = !e10s # test is designed to work on e10s only
[test_webextension-addon-debugging-reload.html]
skip-if = !e10s # test is designed to work on e10s only
-[test_websocket-server.html]
--- a/devtools/shared/security/socket.js
+++ b/devtools/shared/security/socket.js
@@ -12,17 +12,17 @@ var { Ci, Cc, CC, Cr } = require("chrome
Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
var Services = require("Services");
var promise = require("promise");
var defer = require("devtools/shared/defer");
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
var { dumpn, dumpv } = DevToolsUtils;
loader.lazyRequireGetter(this, "WebSocketServer",
- "devtools/server/websocket-server");
+ "devtools/server/socket/websocket-server");
loader.lazyRequireGetter(this, "DebuggerTransport",
"devtools/shared/transport/transport", true);
loader.lazyRequireGetter(this, "WebSocketDebuggerTransport",
"devtools/shared/transport/websocket-transport");
loader.lazyRequireGetter(this, "DebuggerServer",
"devtools/server/main", true);
loader.lazyRequireGetter(this, "discovery",
"devtools/shared/discovery/discovery");