From b98f9f1efe6521645615146555004915ef6ecc8e Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Thu, 24 May 2018 10:12:35 -0400 Subject: [PATCH] Replace Node test runner with golang one. --- Makefile | 4 +- integration_test.go | 86 +++++++++++++++++++++++++++++++++ package.json | 1 - test.js | 52 -------------------- yarn.lock | 115 +------------------------------------------- 5 files changed, 89 insertions(+), 169 deletions(-) create mode 100644 integration_test.go delete mode 100755 test.js diff --git a/Makefile b/Makefile index 1a31e3c083..204adccf93 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,6 @@ TS_FILES = \ msg.pb.js \ os.ts \ runtime.ts \ - test.js \ timers.ts \ tsconfig.json \ types.ts \ @@ -69,7 +68,6 @@ fmt: node_modules clang-format msg.proto -i test: deno - node test.js - go test + go test -v .PHONY: test lint clean distclean diff --git a/integration_test.go b/integration_test.go new file mode 100644 index 0000000000..a646c4553b --- /dev/null +++ b/integration_test.go @@ -0,0 +1,86 @@ +package main + +import ( + "bytes" + "io/ioutil" + "net" + "net/http" + "os" + "os/exec" + "path" + "strings" + "testing" +) + +// Some tests require an HTTP server. We start one here. +// Because we process tests synchronously in this program we must run +// the server as a subprocess. +// Note that "localhost:4545" is hardcoded into the tests at the moment, +// so if the server runs on a different port, it will fail. +func startServer() { + l, err := net.Listen("tcp", ":4545") + if err != nil { + panic(err) + } + rootHandler := http.FileServer(http.Dir(".")) + go func() { + if err := http.Serve(l, rootHandler); err != nil { + panic(err) + } + }() +} + +func listTestFiles() []string { + files, err := ioutil.ReadDir("testdata") + if err != nil { + panic(err) + } + out := make([]string, 0) + for _, file := range files { + fn := file.Name() + if strings.HasSuffix(fn, ".out") { + out = append(out, fn) + } + } + return out +} + +func CheckOutput(t *testing.T, outFile string, denoFn string) { + outFile = path.Join("testdata", outFile) + jsFile := strings.TrimSuffix(outFile, ".out") + + expected, err := ioutil.ReadFile(outFile) + if err != nil { + t.Fatal(err.Error()) + } + + cmd := exec.Command(denoFn, jsFile, "--reload") + var out bytes.Buffer + cmd.Stdout = &out + err = cmd.Run() + if err != nil { + t.Fatal(err.Error()) + } + actual := out.Bytes() + if bytes.Compare(actual, expected) != 0 { + t.Fatalf(`Actual output does not match expected. +-----Actual------------------- +%s-----Expected----------------- +%s------------------------------`, string(actual), string(expected)) + } +} + +func TestIntegration(t *testing.T) { + startServer() + cwd, err := os.Getwd() + if err != nil { + panic(err) + } + denoFn := path.Join(cwd, "deno") + outFiles := listTestFiles() + for _, outFile := range outFiles { + t.Run(outFile, func(t *testing.T) { + CheckOutput(t, outFile, denoFn) + }) + } +} diff --git a/package.json b/package.json index ae1aec3d58..fd45f95687 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "@types/source-map-support": "^0.4.0", "base64-js": "^1.3.0", "espree": "^3.5.3", - "http-server": "^0.11.1", "jsdoc": "^3.5.5", "parcel-bundler": "^1.8.1", "prettier": "^1.12.1", diff --git a/test.js b/test.js deleted file mode 100755 index 36c0b58d37..0000000000 --- a/test.js +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env node -// Do not include this file from other parts of the code. We use node to -// bootstrap a test runner. - -const fs = require("fs"); -const path = require("path"); -const { spawn, execFileSync } = require("child_process"); - -// Some tests require an HTTP server. We start one here. -// Because we process tests synchronously in this program we must run -// the server as a subprocess. -// Note that "localhost:4545" is hardcoded into the tests at the moment, -// so if the server runs on a different port, it will fail. -const httpServerArgs = ["node_modules/.bin/http-server", __dirname, "-p 4545"]; -const server = spawn(process.execPath, httpServerArgs, { - cwd: __dirname, - stdio: "inherit" -}); -// TODO: For some reason the http-server doesn't exit properly -// when this program dies. So we force it with the exit handler here. -server.unref(); -process.on("exit", () => server.kill("SIGINT")); - -const testdataDir = path.join(__dirname, "testdata"); -const denoFn = path.join(__dirname, "deno"); -const files = fs - .readdirSync(testdataDir) - .filter(fn => fn.endsWith(".out")) - .map(fn => path.join(testdataDir, fn)); - -function deno(inFile) { - let args = [inFile]; - console.log("deno", ...args); - return execFileSync(denoFn, args); -} - -for (const outFile of files) { - const inFile = outFile.replace(/\.out$/, ""); - let stdoutBuffer = deno(inFile); - let outFileBuffer = fs.readFileSync(outFile); - if (0 != Buffer.compare(stdoutBuffer, outFileBuffer)) { - throw Error(`test error ---- stdoutBuffer - ${inFile} -${stdoutBuffer.toString()} ---- outFileBuffer - ${outFile} -${outFileBuffer.toString()} ---------------------- - `); - } -} - -console.log("Tests done"); diff --git a/yarn.lock b/yarn.lock index 3662af181a..caf9dd2259 100644 --- a/yarn.lock +++ b/yarn.lock @@ -181,10 +181,6 @@ async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" -async@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - atob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a" @@ -1044,10 +1040,6 @@ colormin@^1.0.5: css-color-names "0.0.4" has "^1.0.1" -colors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - colors@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" @@ -1118,10 +1110,6 @@ core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" -corser@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87" - create-ecdh@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" @@ -1282,12 +1270,6 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6. dependencies: ms "2.0.0" -debug@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - dependencies: - ms "2.0.0" - decamelize@^1.0.0, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1424,15 +1406,6 @@ duplexer2@~0.1.4: dependencies: readable-stream "^2.0.2" -ecstatic@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.2.0.tgz#1b1aee1ca7c6b99cfb5cf6c9b26b481b90c4409f" - dependencies: - he "^1.1.1" - mime "^1.4.1" - minimist "^1.1.0" - url-join "^2.0.2" - editorconfig@^0.13.2: version "0.13.3" resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34" @@ -1539,10 +1512,6 @@ etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" -eventemitter3@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" - events@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" @@ -1622,12 +1591,6 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -follow-redirects@^1.0.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.4.1.tgz#d8120f4518190f55aac65bb6fc7b85fcd666d6aa" - dependencies: - debug "^3.1.0" - for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -1786,10 +1749,6 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.0" -he@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" - hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -1840,27 +1799,6 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" -http-proxy@^1.8.1: - version "1.17.0" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a" - dependencies: - eventemitter3 "^3.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - -http-server@^0.11.1: - version "0.11.1" - resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b" - dependencies: - colors "1.0.3" - corser "~2.0.0" - ecstatic "^3.0.0" - http-proxy "^1.8.1" - opener "~1.4.0" - optimist "0.6.x" - portfinder "^1.0.13" - union "~0.4.3" - https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" @@ -2316,10 +2254,6 @@ mime@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" -mime@^1.4.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - minimalistic-assert@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -2338,14 +2272,10 @@ minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" -minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: +minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" -minimist@~0.0.1: - version "0.0.10" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" - minipass@^2.2.1, minipass@^2.2.4: version "2.3.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.0.tgz#2e11b1c46df7fe7f1afbe9a490280add21ffe384" @@ -2366,7 +2296,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -2582,23 +2512,12 @@ once@^1.3.0: dependencies: wrappy "1" -opener@~1.4.0: - version "1.4.3" - resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8" - opn@^5.1.0: version "5.3.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c" dependencies: is-wsl "^1.1.0" -optimist@0.6.x: - version "0.6.1" - resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" - dependencies: - minimist "~0.0.1" - wordwrap "~0.0.2" - optionator@^0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" @@ -2744,14 +2663,6 @@ physical-cpu-count@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/physical-cpu-count/-/physical-cpu-count-2.0.0.tgz#18de2f97e4bf7a9551ad7511942b5496f7aba660" -portfinder@^1.0.13: - version "1.0.13" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9" - dependencies: - async "^1.5.2" - debug "^2.2.0" - mkdirp "0.5.x" - posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -3074,10 +2985,6 @@ q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" -qs@~2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404" - query-string@^4.1.0: version "4.3.4" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" @@ -3221,10 +3128,6 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - requizzle@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.1.tgz#6943c3530c4d9a7e46f1cddd51c158fc670cdbde" @@ -3786,12 +3689,6 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^0.4.3" -union@~0.4.3: - version "0.4.6" - resolved "https://registry.yarnpkg.com/union/-/union-0.4.6.tgz#198fbdaeba254e788b0efcb630bc11f24a2959e0" - dependencies: - qs "~2.3.3" - uniq@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" @@ -3825,10 +3722,6 @@ urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" -url-join@^2.0.2: - version "2.0.5" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728" - url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -3901,10 +3794,6 @@ wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" -wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"