From 3c2820a5e18e5f378211cd92c08ca2dbc450639e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Fri, 25 Sep 2015 19:43:20 +0200 Subject: [PATCH] Remove unneeded resources server --- test/acceptance/ported/regressions.js | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/test/acceptance/ported/regressions.js b/test/acceptance/ported/regressions.js index 8a1423e4..f1d3cb31 100644 --- a/test/acceptance/ported/regressions.js +++ b/test/acceptance/ported/regressions.js @@ -24,39 +24,16 @@ function rmdir_recursive_sync(dirname) { describe('regressions', function() { - var res_serv; // resources server - var res_serv_status = { numrequests:0 }; // status of resources server - var res_serv_port = 8033; // FIXME: make configurable ? - var req2paramsFn; - before(function(done) { + before(function() { req2paramsFn = BaseController.prototype.req2params; BaseController.prototype.req2params = ServerOptions.req2params; - // Start a server to test external resources - res_serv = http.createServer( function(request, response) { - ++res_serv_status.numrequests; - var filename = __dirname + '/../fixtures/markers' + request.url; - fs.readFile(filename, "binary", function(err, file) { - if ( err ) { - response.writeHead(404, {'Content-Type': 'text/plain'}); - response.write("404 Not Found\n"); - } else { - response.writeHead(200); - response.write(file, "binary"); - } - response.end(); - }); - }); - res_serv.listen(res_serv_port, done); }); - after(function(done) { + after(function() { BaseController.prototype.req2params = req2paramsFn; rmdir_recursive_sync(global.environment.millstone.cache_basedir); - - // Close the resources server - res_serv.close(done); }); // See https://github.com/Vizzuality/Windshaft/issues/65