From d1e0b8548eb86a9935f29d5d1dc4355acff5a1d7 Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Tue, 25 Feb 2020 17:03:36 +0100 Subject: [PATCH 1/7] decaffeinate: Rename SmokeTests.coffee from .coffee to .js --- test/smoke/coffee/{SmokeTests.coffee => SmokeTests.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/smoke/coffee/{SmokeTests.coffee => SmokeTests.js} (100%) diff --git a/test/smoke/coffee/SmokeTests.coffee b/test/smoke/coffee/SmokeTests.js similarity index 100% rename from test/smoke/coffee/SmokeTests.coffee rename to test/smoke/coffee/SmokeTests.js From 4f01b7716e012b2104774eb65bcb6ca9a8bb6490 Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Tue, 25 Feb 2020 17:03:37 +0100 Subject: [PATCH 2/7] decaffeinate: Convert SmokeTests.coffee to JS --- test/smoke/coffee/SmokeTests.js | 76 +++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 28 deletions(-) diff --git a/test/smoke/coffee/SmokeTests.js b/test/smoke/coffee/SmokeTests.js index 9ecf09c..a8ad80b 100644 --- a/test/smoke/coffee/SmokeTests.js +++ b/test/smoke/coffee/SmokeTests.js @@ -1,22 +1,29 @@ -chai = require("chai") -chai.should() unless Object.prototype.should? -expect = chai.expect -request = require "request" -Settings = require "settings-sharelatex" +/* + * decaffeinate suggestions: + * DS101: Remove unnecessary use of Array.from + * DS102: Remove unnecessary code created because of implicit returns + * DS207: Consider shorter variations of null checks + * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md + */ +const chai = require("chai"); +if (Object.prototype.should == null) { chai.should(); } +const { expect } = chai; +const request = require("request"); +const Settings = require("settings-sharelatex"); -buildUrl = (path) -> "http://#{Settings.internal.clsi.host}:#{Settings.internal.clsi.port}/#{path}" +const buildUrl = path => `http://${Settings.internal.clsi.host}:${Settings.internal.clsi.port}/${path}`; -url = buildUrl("project/smoketest-#{process.pid}/compile") +const url = buildUrl(`project/smoketest-${process.pid}/compile`); -describe "Running a compile", -> - before (done) -> - request.post { - url: url - json: - compile: - resources: [ - path: "main.tex" - content: """ +describe("Running a compile", function() { + before(function(done) { + return request.post({ + url, + json: { + compile: { + resources: [{ + path: "main.tex", + content: `\ % Membrane-like surface % Author: Yotam Avital \\documentclass{article} @@ -47,18 +54,31 @@ describe "Running a compile", -> } } \\end{tikzpicture} -\\end{document} - """ +\\end{document}\ +` + } ] - }, (@error, @response, @body) => - done() + } + } + }, (error, response, body) => { + this.error = error; + this.response = response; + this.body = body; + return done(); + }); + }); - it "should return the pdf", -> - for file in @body.compile.outputFiles - return if file.type == "pdf" - throw new Error("no pdf returned") + it("should return the pdf", function() { + for (let file of Array.from(this.body.compile.outputFiles)) { + if (file.type === "pdf") { return; } + } + throw new Error("no pdf returned"); + }); - it "should return the log", -> - for file in @body.compile.outputFiles - return if file.type == "log" - throw new Error("no log returned") + return it("should return the log", function() { + for (let file of Array.from(this.body.compile.outputFiles)) { + if (file.type === "log") { return; } + } + throw new Error("no log returned"); + }); +}); From 699000111bf281404774ee1f42cb6294a89d37bb Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Tue, 25 Feb 2020 17:03:39 +0100 Subject: [PATCH 3/7] decaffeinate: Run post-processing cleanups on SmokeTests.coffee --- test/smoke/coffee/SmokeTests.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/smoke/coffee/SmokeTests.js b/test/smoke/coffee/SmokeTests.js index a8ad80b..6540401 100644 --- a/test/smoke/coffee/SmokeTests.js +++ b/test/smoke/coffee/SmokeTests.js @@ -1,3 +1,8 @@ +/* eslint-disable + no-unused-vars, +*/ +// TODO: This file was created by bulk-decaffeinate. +// Fix any style issues and re-enable lint. /* * decaffeinate suggestions: * DS101: Remove unnecessary use of Array.from @@ -69,14 +74,14 @@ describe("Running a compile", function() { }); it("should return the pdf", function() { - for (let file of Array.from(this.body.compile.outputFiles)) { + for (const file of Array.from(this.body.compile.outputFiles)) { if (file.type === "pdf") { return; } } throw new Error("no pdf returned"); }); return it("should return the log", function() { - for (let file of Array.from(this.body.compile.outputFiles)) { + for (const file of Array.from(this.body.compile.outputFiles)) { if (file.type === "log") { return; } } throw new Error("no log returned"); From d180fcd84a5183662398f2c8f80bc468bbcc6ef4 Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Tue, 25 Feb 2020 17:03:57 +0100 Subject: [PATCH 4/7] decaffeinate: Rename loadTest.coffee from .coffee to .js --- test/load/coffee/{loadTest.coffee => loadTest.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/load/coffee/{loadTest.coffee => loadTest.js} (100%) diff --git a/test/load/coffee/loadTest.coffee b/test/load/coffee/loadTest.js similarity index 100% rename from test/load/coffee/loadTest.coffee rename to test/load/coffee/loadTest.js From a327c217e797656e941a8cd7300a5dbfa691e0cd Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Tue, 25 Feb 2020 17:03:57 +0100 Subject: [PATCH 5/7] decaffeinate: Convert loadTest.coffee to JS --- test/load/coffee/loadTest.js | 144 +++++++++++++++++++++-------------- 1 file changed, 85 insertions(+), 59 deletions(-) diff --git a/test/load/coffee/loadTest.js b/test/load/coffee/loadTest.js index 26a23fb..d5ddecf 100644 --- a/test/load/coffee/loadTest.js +++ b/test/load/coffee/loadTest.js @@ -1,71 +1,97 @@ -request = require "request" -Settings = require "settings-sharelatex" -async = require("async") -fs = require("fs") -_ = require("underscore") -concurentCompiles = 5 -totalCompiles = 50 +/* + * decaffeinate suggestions: + * DS102: Remove unnecessary code created because of implicit returns + * DS207: Consider shorter variations of null checks + * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md + */ +const request = require("request"); +const Settings = require("settings-sharelatex"); +const async = require("async"); +const fs = require("fs"); +const _ = require("underscore"); +const concurentCompiles = 5; +const totalCompiles = 50; -buildUrl = (path) -> "http://#{Settings.internal.clsi.host}:#{Settings.internal.clsi.port}/#{path}" +const buildUrl = path => `http://${Settings.internal.clsi.host}:${Settings.internal.clsi.port}/${path}`; -mainTexContent = fs.readFileSync("./bulk.tex", "utf-8") +const mainTexContent = fs.readFileSync("./bulk.tex", "utf-8"); -compileTimes = [] -failedCount = 0 +const compileTimes = []; +let failedCount = 0; -getAverageCompileTime = -> - totalTime = _.reduce compileTimes, (sum, time)-> - sum + time - , 0 - return totalTime / compileTimes.length +const getAverageCompileTime = function() { + const totalTime = _.reduce(compileTimes, (sum, time)=> sum + time + , 0); + return totalTime / compileTimes.length; +}; -makeRequest = (compileNumber, callback)-> - bulkBodyCount = 7 - bodyContent = "" - while --bulkBodyCount - bodyContent = bodyContent+=mainTexContent +const makeRequest = function(compileNumber, callback){ + let bulkBodyCount = 7; + let bodyContent = ""; + while (--bulkBodyCount) { + bodyContent = (bodyContent+=mainTexContent); + } - startTime = new Date() - request.post { - url: buildUrl("project/loadcompile-#{compileNumber}/compile") - json: - compile: - resources: [ - path: "main.tex" - content: """ - \\documentclass{article} - \\begin{document} - #{bodyContent} - \\end{document} - """ + const startTime = new Date(); + return request.post({ + url: buildUrl(`project/loadcompile-${compileNumber}/compile`), + json: { + compile: { + resources: [{ + path: "main.tex", + content: `\ +\\documentclass{article} +\\begin{document} +${bodyContent} +\\end{document}\ +` + } ] - }, (err, response, body)-> - if response.statusCode != 200 - failedCount++ - return callback("compile #{compileNumber} failed") - if err? - failedCount++ - return callback("failed") - totalTime = new Date() - startTime - console.log totalTime+"ms" - compileTimes.push(totalTime) - callback(err) + } + } + }, function(err, response, body){ + if (response.statusCode !== 200) { + failedCount++; + return callback(`compile ${compileNumber} failed`); + } + if (err != null) { + failedCount++; + return callback("failed"); + } + const totalTime = new Date() - startTime; + console.log(totalTime+"ms"); + compileTimes.push(totalTime); + return callback(err); + }); +}; -jobs = _.map [1..totalCompiles], (i)-> - return (cb)-> - makeRequest(i, cb) +const jobs = _.map(__range__(1, totalCompiles, true), i=> + cb=> makeRequest(i, cb) +); -startTime = new Date() -async.parallelLimit jobs, concurentCompiles, (err)-> - if err? - console.error err - console.log("total time taken = #{(new Date() - startTime)/1000}s") - console.log("total compiles = #{totalCompiles}") - console.log("concurent compiles = #{concurentCompiles}") - console.log("average time = #{getAverageCompileTime()/1000}s") - console.log("max time = #{_.max(compileTimes)/1000}s") - console.log("min time = #{_.min(compileTimes)/1000}s") - console.log("total failures = #{failedCount}") +const startTime = new Date(); +async.parallelLimit(jobs, concurentCompiles, function(err){ + if (err != null) { + console.error(err); + } + console.log(`total time taken = ${(new Date() - startTime)/1000}s`); + console.log(`total compiles = ${totalCompiles}`); + console.log(`concurent compiles = ${concurentCompiles}`); + console.log(`average time = ${getAverageCompileTime()/1000}s`); + console.log(`max time = ${_.max(compileTimes)/1000}s`); + console.log(`min time = ${_.min(compileTimes)/1000}s`); + return console.log(`total failures = ${failedCount}`); +}); + +function __range__(left, right, inclusive) { + let range = []; + let ascending = left < right; + let end = !inclusive ? right : ascending ? right + 1 : right - 1; + for (let i = left; ascending ? i < end : i > end; ascending ? i++ : i--) { + range.push(i); + } + return range; +} \ No newline at end of file From 957f80ada4a9518a2cd7dc0cfa5e56d6a75c2fd3 Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Tue, 25 Feb 2020 17:03:58 +0100 Subject: [PATCH 6/7] decaffeinate: Run post-processing cleanups on loadTest.coffee --- test/load/coffee/loadTest.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/test/load/coffee/loadTest.js b/test/load/coffee/loadTest.js index d5ddecf..2e769a5 100644 --- a/test/load/coffee/loadTest.js +++ b/test/load/coffee/loadTest.js @@ -1,3 +1,8 @@ +/* eslint-disable + standard/no-callback-literal, +*/ +// TODO: This file was created by bulk-decaffeinate. +// Fix any style issues and re-enable lint. /* * decaffeinate suggestions: * DS102: Remove unnecessary code created because of implicit returns @@ -50,7 +55,7 @@ ${bodyContent} ] } } - }, function(err, response, body){ + }, (err, response, body) => { if (response.statusCode !== 200) { failedCount++; return callback(`compile ${compileNumber} failed`); @@ -72,7 +77,7 @@ const jobs = _.map(__range__(1, totalCompiles, true), i=> ); const startTime = new Date(); -async.parallelLimit(jobs, concurentCompiles, function(err){ +async.parallelLimit(jobs, concurentCompiles, (err) => { if (err != null) { console.error(err); } @@ -87,9 +92,9 @@ async.parallelLimit(jobs, concurentCompiles, function(err){ function __range__(left, right, inclusive) { - let range = []; - let ascending = left < right; - let end = !inclusive ? right : ascending ? right + 1 : right - 1; + const range = []; + const ascending = left < right; + const end = !inclusive ? right : ascending ? right + 1 : right - 1; for (let i = left; ascending ? i < end : i > end; ascending ? i++ : i--) { range.push(i); } From bf470cf5ae149487ccf484d15c272f4d32174e4e Mon Sep 17 00:00:00 2001 From: mserranom Date: Tue, 25 Feb 2020 17:15:31 +0100 Subject: [PATCH 7/7] moved decaffeinated files to js folder --- test/load/coffee/loadTest.js | 102 ----------------------- test/load/{coffee => js}/bulk.tex | 0 test/load/js/loadTest.js | 103 ++++++++++++++++++++++++ test/smoke/{coffee => js}/SmokeTests.js | 93 +++++++++++---------- 4 files changed, 155 insertions(+), 143 deletions(-) delete mode 100644 test/load/coffee/loadTest.js rename test/load/{coffee => js}/bulk.tex (100%) create mode 100644 test/load/js/loadTest.js rename test/smoke/{coffee => js}/SmokeTests.js (62%) diff --git a/test/load/coffee/loadTest.js b/test/load/coffee/loadTest.js deleted file mode 100644 index 2e769a5..0000000 --- a/test/load/coffee/loadTest.js +++ /dev/null @@ -1,102 +0,0 @@ -/* eslint-disable - standard/no-callback-literal, -*/ -// TODO: This file was created by bulk-decaffeinate. -// Fix any style issues and re-enable lint. -/* - * decaffeinate suggestions: - * DS102: Remove unnecessary code created because of implicit returns - * DS207: Consider shorter variations of null checks - * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md - */ -const request = require("request"); -const Settings = require("settings-sharelatex"); -const async = require("async"); -const fs = require("fs"); -const _ = require("underscore"); -const concurentCompiles = 5; -const totalCompiles = 50; - -const buildUrl = path => `http://${Settings.internal.clsi.host}:${Settings.internal.clsi.port}/${path}`; - -const mainTexContent = fs.readFileSync("./bulk.tex", "utf-8"); - -const compileTimes = []; -let failedCount = 0; - -const getAverageCompileTime = function() { - const totalTime = _.reduce(compileTimes, (sum, time)=> sum + time - , 0); - return totalTime / compileTimes.length; -}; - -const makeRequest = function(compileNumber, callback){ - let bulkBodyCount = 7; - let bodyContent = ""; - while (--bulkBodyCount) { - bodyContent = (bodyContent+=mainTexContent); - } - - - const startTime = new Date(); - return request.post({ - url: buildUrl(`project/loadcompile-${compileNumber}/compile`), - json: { - compile: { - resources: [{ - path: "main.tex", - content: `\ -\\documentclass{article} -\\begin{document} -${bodyContent} -\\end{document}\ -` - } - ] - } - } - }, (err, response, body) => { - if (response.statusCode !== 200) { - failedCount++; - return callback(`compile ${compileNumber} failed`); - } - if (err != null) { - failedCount++; - return callback("failed"); - } - const totalTime = new Date() - startTime; - console.log(totalTime+"ms"); - compileTimes.push(totalTime); - return callback(err); - }); -}; - - -const jobs = _.map(__range__(1, totalCompiles, true), i=> - cb=> makeRequest(i, cb) -); - -const startTime = new Date(); -async.parallelLimit(jobs, concurentCompiles, (err) => { - if (err != null) { - console.error(err); - } - console.log(`total time taken = ${(new Date() - startTime)/1000}s`); - console.log(`total compiles = ${totalCompiles}`); - console.log(`concurent compiles = ${concurentCompiles}`); - console.log(`average time = ${getAverageCompileTime()/1000}s`); - console.log(`max time = ${_.max(compileTimes)/1000}s`); - console.log(`min time = ${_.min(compileTimes)/1000}s`); - return console.log(`total failures = ${failedCount}`); -}); - - -function __range__(left, right, inclusive) { - const range = []; - const ascending = left < right; - const end = !inclusive ? right : ascending ? right + 1 : right - 1; - for (let i = left; ascending ? i < end : i > end; ascending ? i++ : i--) { - range.push(i); - } - return range; -} \ No newline at end of file diff --git a/test/load/coffee/bulk.tex b/test/load/js/bulk.tex similarity index 100% rename from test/load/coffee/bulk.tex rename to test/load/js/bulk.tex diff --git a/test/load/js/loadTest.js b/test/load/js/loadTest.js new file mode 100644 index 0000000..ff9850e --- /dev/null +++ b/test/load/js/loadTest.js @@ -0,0 +1,103 @@ +/* eslint-disable + standard/no-callback-literal, +*/ +// TODO: This file was created by bulk-decaffeinate. +// Fix any style issues and re-enable lint. +/* + * decaffeinate suggestions: + * DS102: Remove unnecessary code created because of implicit returns + * DS207: Consider shorter variations of null checks + * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md + */ +const request = require('request') +const Settings = require('settings-sharelatex') +const async = require('async') +const fs = require('fs') +const _ = require('underscore') +const concurentCompiles = 5 +const totalCompiles = 50 + +const buildUrl = path => + `http://${Settings.internal.clsi.host}:${Settings.internal.clsi.port}/${path}` + +const mainTexContent = fs.readFileSync('./bulk.tex', 'utf-8') + +const compileTimes = [] +let failedCount = 0 + +const getAverageCompileTime = function() { + const totalTime = _.reduce(compileTimes, (sum, time) => sum + time, 0) + return totalTime / compileTimes.length +} + +const makeRequest = function(compileNumber, callback) { + let bulkBodyCount = 7 + let bodyContent = '' + while (--bulkBodyCount) { + bodyContent = bodyContent += mainTexContent + } + + const startTime = new Date() + return request.post( + { + url: buildUrl(`project/loadcompile-${compileNumber}/compile`), + json: { + compile: { + resources: [ + { + path: 'main.tex', + content: `\ +\\documentclass{article} +\\begin{document} +${bodyContent} +\\end{document}\ +` + } + ] + } + } + }, + (err, response, body) => { + if (response.statusCode !== 200) { + failedCount++ + return callback(`compile ${compileNumber} failed`) + } + if (err != null) { + failedCount++ + return callback('failed') + } + const totalTime = new Date() - startTime + console.log(totalTime + 'ms') + compileTimes.push(totalTime) + return callback(err) + } + ) +} + +const jobs = _.map(__range__(1, totalCompiles, true), i => cb => + makeRequest(i, cb) +) + +const startTime = new Date() +async.parallelLimit(jobs, concurentCompiles, err => { + if (err != null) { + console.error(err) + } + console.log(`total time taken = ${(new Date() - startTime) / 1000}s`) + console.log(`total compiles = ${totalCompiles}`) + console.log(`concurent compiles = ${concurentCompiles}`) + console.log(`average time = ${getAverageCompileTime() / 1000}s`) + console.log(`max time = ${_.max(compileTimes) / 1000}s`) + console.log(`min time = ${_.min(compileTimes) / 1000}s`) + return console.log(`total failures = ${failedCount}`) +}) + +function __range__(left, right, inclusive) { + const range = [] + const ascending = left < right + const end = !inclusive ? right : ascending ? right + 1 : right - 1 + for (let i = left; ascending ? i < end : i > end; ascending ? i++ : i--) { + range.push(i) + } + return range +} diff --git a/test/smoke/coffee/SmokeTests.js b/test/smoke/js/SmokeTests.js similarity index 62% rename from test/smoke/coffee/SmokeTests.js rename to test/smoke/js/SmokeTests.js index 6540401..851ea85 100644 --- a/test/smoke/coffee/SmokeTests.js +++ b/test/smoke/js/SmokeTests.js @@ -10,25 +10,30 @@ * DS207: Consider shorter variations of null checks * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ -const chai = require("chai"); -if (Object.prototype.should == null) { chai.should(); } -const { expect } = chai; -const request = require("request"); -const Settings = require("settings-sharelatex"); +const chai = require('chai') +if (Object.prototype.should == null) { + chai.should() +} +const { expect } = chai +const request = require('request') +const Settings = require('settings-sharelatex') -const buildUrl = path => `http://${Settings.internal.clsi.host}:${Settings.internal.clsi.port}/${path}`; +const buildUrl = path => + `http://${Settings.internal.clsi.host}:${Settings.internal.clsi.port}/${path}` -const url = buildUrl(`project/smoketest-${process.pid}/compile`); +const url = buildUrl(`project/smoketest-${process.pid}/compile`) -describe("Running a compile", function() { - before(function(done) { - return request.post({ - url, - json: { - compile: { - resources: [{ - path: "main.tex", - content: `\ +describe('Running a compile', function() { + before(function(done) { + return request.post( + { + url, + json: { + compile: { + resources: [ + { + path: 'main.tex', + content: `\ % Membrane-like surface % Author: Yotam Avital \\documentclass{article} @@ -61,29 +66,35 @@ describe("Running a compile", function() { \\end{tikzpicture} \\end{document}\ ` - } - ] - } - } - }, (error, response, body) => { - this.error = error; - this.response = response; - this.body = body; - return done(); - }); - }); + } + ] + } + } + }, + (error, response, body) => { + this.error = error + this.response = response + this.body = body + return done() + } + ) + }) - it("should return the pdf", function() { - for (const file of Array.from(this.body.compile.outputFiles)) { - if (file.type === "pdf") { return; } - } - throw new Error("no pdf returned"); - }); - - return it("should return the log", function() { - for (const file of Array.from(this.body.compile.outputFiles)) { - if (file.type === "log") { return; } - } - throw new Error("no log returned"); - }); -}); + it('should return the pdf', function() { + for (const file of Array.from(this.body.compile.outputFiles)) { + if (file.type === 'pdf') { + return + } + } + throw new Error('no pdf returned') + }) + + return it('should return the log', function() { + for (const file of Array.from(this.body.compile.outputFiles)) { + if (file.type === 'log') { + return + } + } + throw new Error('no log returned') + }) +})