summaryrefslogtreecommitdiff
path: root/http/server_test.ts
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2019-05-20 09:17:26 -0400
committerGitHub <noreply@github.com>2019-05-20 09:17:26 -0400
commita295bb0d4255993103b6afe9ffdd2bd4e4c65c95 (patch)
tree48d491488e8ac12e2f666ea360962a494e819884 /http/server_test.ts
parent227d92e046220de30195432ed5235ccb19c91fc6 (diff)
Clean up HTTP async iterator code (denoland/deno_std#411)
Original: https://github.com/denoland/deno_std/commit/68faf32f721d2a95c7b1c75661713c8118c077c7
Diffstat (limited to 'http/server_test.ts')
-rw-r--r--http/server_test.ts32
1 files changed, 3 insertions, 29 deletions
diff --git a/http/server_test.ts b/http/server_test.ts
index 82a368395..396a0321a 100644
--- a/http/server_test.ts
+++ b/http/server_test.ts
@@ -22,31 +22,6 @@ const dec = new TextDecoder();
type Handler = () => void;
-interface Deferred {
- promise: Promise<{}>;
- resolve: Handler;
- reject: Handler;
-}
-
-function deferred(isResolved = false): Deferred {
- let resolve: Handler = (): void => void 0;
- let reject: Handler = (): void => void 0;
- const promise = new Promise(
- (res, rej): void => {
- resolve = res;
- reject = rej;
- }
- );
- if (isResolved) {
- resolve();
- }
- return {
- promise,
- resolve,
- reject
- };
-}
-
const responseTests: ResponseTest[] = [
// Default response
{
@@ -72,8 +47,8 @@ test(async function responseWrite(): Promise<void> {
const buf = new Buffer();
const bufw = new BufWriter(buf);
const request = new ServerRequest();
- request.pipelineId = 1;
request.w = bufw;
+
request.conn = {
localAddr: "",
remoteAddr: "",
@@ -86,13 +61,12 @@ test(async function responseWrite(): Promise<void> {
write: async (): Promise<number> => {
return -1;
},
- close: (): void => {},
- lastPipelineId: 0,
- pendingDeferredMap: new Map([[0, deferred(true)], [1, deferred()]])
+ close: (): void => {}
};
await request.respond(testCase.response);
assertEquals(buf.toString(), testCase.raw);
+ await request.done;
}
});