Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: lint server_test.ts #19175

Merged
merged 1 commit into from
May 18, 2023
Merged

chore: lint server_test.ts #19175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 50 additions & 49 deletions cli/tests/unit/serve_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.

// deno-lint-ignore-file

import { assertMatch } from "https://deno.land/std@v0.42.0/testing/asserts.ts";
import { Buffer, BufReader, BufWriter } from "../../../test_util/std/io/mod.ts";
import { TextProtoReader } from "../testdata/run/textproto.ts";
Expand Down Expand Up @@ -150,7 +148,6 @@ Deno.test({ permissions: { net: true } }, async function httpServerBasic() {

Deno.test({ permissions: { net: true } }, async function httpServerOnError() {
const ac = new AbortController();
const promise = deferred();
const listeningPromise = deferred();
let requestStash: Request | null;

Expand Down Expand Up @@ -183,8 +180,10 @@ Deno.test(
{ permissions: { net: true } },
async function httpServerOnErrorFails() {
const ac = new AbortController();
const promise = deferred();
const listeningPromise = deferred();
// NOTE(bartlomieju): deno lint doesn't know that it's actually used later,
// but TypeScript can't see that either ¯\_(ツ)_/¯
// deno-lint-ignore no-unused-vars
let requestStash: Request | null;

const server = Deno.serve({
Expand Down Expand Up @@ -405,7 +404,7 @@ function createUrlTest(
const urlPromise = deferred();
const ac = new AbortController();
const server = Deno.serve({
handler: async (request: Request) => {
handler: (request: Request) => {
urlPromise.resolve(request.url);
return new Response("");
},
Expand Down Expand Up @@ -556,7 +555,7 @@ function createStreamTest(count: number, delay: number, action: string) {
}
}

function makeStream(count: number, delay: number): ReadableStream {
function makeStream(_count: number, delay: number): ReadableStream {
return new ReadableStream({
start(controller) {
if (delay == 0) {
Expand All @@ -572,7 +571,7 @@ function createStreamTest(count: number, delay: number, action: string) {
const ac = new AbortController();
const listeningPromise = deferred();
const server = Deno.serve({
handler: async (request) => {
handler: (_request) => {
return new Response(makeStream(count, delay));
},
port: 4501,
Expand Down Expand Up @@ -602,8 +601,8 @@ function createStreamTest(count: number, delay: number, action: string) {
});
}

for (let count of [0, 1, 2, 3]) {
for (let delay of [0, 1, 1000]) {
for (const count of [0, 1, 2, 3]) {
for (const delay of [0, 1, 1000]) {
// Creating a stream that errors in start will throw
if (delay > 0) {
createStreamTest(count, delay, "Throw");
Expand Down Expand Up @@ -803,7 +802,7 @@ Deno.test({ permissions: { net: true } }, async function httpServerWebSocket() {
const ac = new AbortController();
const listeningPromise = deferred();
const server = Deno.serve({
handler: async (request) => {
handler: (request) => {
const {
response,
socket,
Expand Down Expand Up @@ -925,7 +924,7 @@ Deno.test(
const ac = new AbortController();
const listeningPromise = deferred();
const server = Deno.serve({
handler: async (request) => {
handler: (request) => {
const {
response,
socket,
Expand Down Expand Up @@ -976,7 +975,7 @@ Deno.test(
const ac = new AbortController();
const listeningPromise = deferred();
const server = Deno.serve({
handler: async (request) => {
handler: (request) => {
const {
response,
socket,
Expand Down Expand Up @@ -1011,7 +1010,7 @@ Deno.test(
const ac = new AbortController();
const listeningPromise = deferred();
const server = Deno.serve({
handler: async (request) => {
handler: (request) => {
const {
response,
socket,
Expand All @@ -1020,7 +1019,7 @@ Deno.test(
console.error(e);
fail();
};
socket.onmessage = (m) => {
socket.onmessage = (_m) => {
socket.send(request.url.toString());
socket.close(1001);
};
Expand Down Expand Up @@ -1058,7 +1057,7 @@ Deno.test(

let headers: Headers;
const server = Deno.serve({
handler: async (request) => {
handler: (request) => {
headers = request.headers;
promise.resolve();
return new Response("");
Expand Down Expand Up @@ -1353,7 +1352,7 @@ Deno.test(
await clientConn.read(buf);

await promise;
let responseText = new TextDecoder("iso-8859-1").decode(buf);
const responseText = new TextDecoder("iso-8859-1").decode(buf);
clientConn.close();

ac.abort();
Expand Down Expand Up @@ -1505,7 +1504,7 @@ Deno.test(
const ac = new AbortController();

const server = Deno.serve({
handler: async (request) => {
handler: (request) => {
assertEquals(request.body, null);
promise.resolve();
return new Response(new Uint8Array([128]));
Expand Down Expand Up @@ -1541,7 +1540,7 @@ Deno.test(
const ac = new AbortController();

const server = Deno.serve({
handler: async (request) => {
handler: (request) => {
assertEquals(request.method, "GET");
assertEquals(request.headers.get("host"), "deno.land");
promise.resolve();
Expand Down Expand Up @@ -1575,7 +1574,7 @@ Deno.test(
const ac = new AbortController();

const server = Deno.serve({
handler: async (request) => {
handler: (request) => {
assertEquals(request.method, "GET");
assertEquals(request.headers.get("server"), "hello\tworld");
promise.resolve();
Expand Down Expand Up @@ -1674,13 +1673,14 @@ Deno.test(

type TestCase = {
headers?: Record<string, string>;
// deno-lint-ignore no-explicit-any
body: any;
expects_chunked?: boolean;
expects_con_len?: boolean;
expectsChunked?: boolean;
expectsConnLen?: boolean;
};

function hasHeader(msg: string, name: string): boolean {
let n = msg.indexOf("\r\n\r\n") || msg.length;
const n = msg.indexOf("\r\n\r\n") || msg.length;
return msg.slice(0, n).includes(name);
}

Expand All @@ -1691,7 +1691,7 @@ function createServerLengthTest(name: string, testCase: TestCase) {
const listeningPromise = deferred();

const server = Deno.serve({
handler: async (request) => {
handler: (request) => {
assertEquals(request.method, "GET");
promise.resolve();
return new Response(testCase.body, testCase.headers ?? {});
Expand Down Expand Up @@ -1722,23 +1722,23 @@ function createServerLengthTest(name: string, testCase: TestCase) {
msg += decoder.decode(buf.subarray(0, readResult));
try {
assert(
testCase.expects_chunked == hasHeader(msg, "Transfer-Encoding:"),
testCase.expectsChunked == hasHeader(msg, "Transfer-Encoding:"),
);
assert(testCase.expects_chunked == hasHeader(msg, "chunked"));
assert(testCase.expects_con_len == hasHeader(msg, "Content-Length:"));
assert(testCase.expectsChunked == hasHeader(msg, "chunked"));
assert(testCase.expectsConnLen == hasHeader(msg, "Content-Length:"));

const n = msg.indexOf("\r\n\r\n") + 4;

if (testCase.expects_chunked) {
if (testCase.expectsChunked) {
assertEquals(msg.slice(n + 1, n + 3), "\r\n");
assertEquals(msg.slice(msg.length - 7), "\r\n0\r\n\r\n");
}

if (testCase.expects_con_len && typeof testCase.body === "string") {
if (testCase.expectsConnLen && typeof testCase.body === "string") {
assertEquals(msg.slice(n), testCase.body);
}
break;
} catch (e) {
} catch {
continue;
}
}
Expand All @@ -1759,60 +1759,60 @@ function stream(s: string): ReadableStream<Uint8Array> {
createServerLengthTest("fixedResponseKnown", {
headers: { "content-length": "11" },
body: "foo bar baz",
expects_chunked: false,
expects_con_len: true,
expectsChunked: false,
expectsConnLen: true,
});

createServerLengthTest("fixedResponseUnknown", {
headers: { "content-length": "11" },
body: stream("foo bar baz"),
expects_chunked: true,
expects_con_len: false,
expectsChunked: true,
expectsConnLen: false,
});

createServerLengthTest("fixedResponseKnownEmpty", {
headers: { "content-length": "0" },
body: "",
expects_chunked: false,
expects_con_len: true,
expectsChunked: false,
expectsConnLen: true,
});

createServerLengthTest("chunkedRespondKnown", {
headers: { "transfer-encoding": "chunked" },
body: "foo bar baz",
expects_chunked: false,
expects_con_len: true,
expectsChunked: false,
expectsConnLen: true,
});

createServerLengthTest("chunkedRespondUnknown", {
headers: { "transfer-encoding": "chunked" },
body: stream("foo bar baz"),
expects_chunked: true,
expects_con_len: false,
expectsChunked: true,
expectsConnLen: false,
});

createServerLengthTest("autoResponseWithKnownLength", {
body: "foo bar baz",
expects_chunked: false,
expects_con_len: true,
expectsChunked: false,
expectsConnLen: true,
});

createServerLengthTest("autoResponseWithUnknownLength", {
body: stream("foo bar baz"),
expects_chunked: true,
expects_con_len: false,
expectsChunked: true,
expectsConnLen: false,
});

createServerLengthTest("autoResponseWithKnownLengthEmpty", {
body: "",
expects_chunked: false,
expects_con_len: true,
expectsChunked: false,
expectsConnLen: true,
});

createServerLengthTest("autoResponseWithUnknownLengthEmpty", {
body: stream(""),
expects_chunked: true,
expects_con_len: false,
expectsChunked: true,
expectsConnLen: false,
});

Deno.test(
Expand Down Expand Up @@ -2102,9 +2102,10 @@ for (const testCase of compressionTestCases) {
const ac = new AbortController();
const listeningPromise = deferred();
const server = Deno.serve({
handler: async (request) => {
handler: async (_request) => {
const f = await makeTempFile(testCase.length);
promise.resolve();
// deno-lint-ignore no-explicit-any
const headers = testCase.out as any;
headers["Content-Length"] = testCase.length.toString();
return new Response(f.readable, {
Expand Down Expand Up @@ -2551,7 +2552,7 @@ Deno.test(
let reqCount = -1;
let timerId: number | undefined;
const server = Deno.serve({
handler: async (req) => {
handler: (_req) => {
reqCount++;
if (reqCount === 0) {
const msg = new TextEncoder().encode("data: hello\r\n\r\n");
Expand Down