Fix a ReferenceError due to forgotten detritus of an old patch, remove a long-obsolete file. r=sparky, a=lumpy
authorjwalden@mit.edu
Sat, 05 Jan 2008 23:45:12 -0800
changeset 9926 e51d96a003c59b3a47d9680fab1121ebeb15dbc4
parent 9925 8560eb34f485430dc2a6cb9291658554d4d4deef
child 9927 d0b89075523d4e2073ac24db6193597c49bcfeec
push id1
push userbsmedberg@mozilla.com
push dateThu, 20 Mar 2008 16:49:24 +0000
treeherdermozilla-central@61007906a1f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssparky, lumpy
milestone1.9b3pre
Fix a ReferenceError due to forgotten detritus of an old patch, remove a long-obsolete file. r=sparky, a=lumpy
testing/mochitest/server.js
testing/mochitest/server.py
--- a/testing/mochitest/server.js
+++ b/testing/mochitest/server.js
@@ -192,17 +192,16 @@ function serverShutdown(metadata, respon
   response.setStatusLine("1.1", 200, "OK");
   response.setHeader("Content-type", "text/plain");
 
   var body = "Server shut down.";
   response.bodyOutputStream.write(body, body.length);
 
   // Note: this doesn't disrupt the current request.
   server.stop();
-  otherDomainServer.stop();
 }
 
 function redirect(metadata, response)
 {
   response.setStatusLine("1.1", 301, "Moved Permanently");
   response.setHeader("Location", metadata.queryString);
 }
 
deleted file mode 100644
--- a/testing/mochitest/server.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import SimpleHTTPServer
-import SocketServer
-
-# minimal web server.  serves files relative to the
-# current directory.
-
-PORT = 8888
-
-Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
-Handler.extensions_map[".xhtml"] = "application/xhtml+xml"
-Handler.extensions_map[".svg"] = "image/svg+xml"
-Handler.extensions_map[".xul"] = "application/vnd.mozilla.xul+xml"
-httpd = SocketServer.TCPServer(("", PORT), Handler)
-
-print "serving at port", PORT
-httpd.serve_forever()