summaryrefslogtreecommitdiff
path: root/std/examples
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-03-24 17:24:58 +0100
committerGitHub <noreply@github.com>2020-03-24 12:24:58 -0400
commit30bcf6a2ea620aa989a7362e7f4a62fc11743bb4 (patch)
treea1e0721425a34c40142230fe392cac15170a6791 /std/examples
parentb2478f3a217d5decbb638bf46e169ee58f17adad (diff)
Revert "avoid using same port number for test (#4147)"
Ref #4467 This reverts commit 60cee4f045778777a16b6fffd6d5b9a1400d7246.
Diffstat (limited to 'std/examples')
-rw-r--r--std/examples/chat/server.ts6
-rw-r--r--std/examples/chat/server_test.ts15
-rw-r--r--std/examples/echo_server.ts2
-rw-r--r--std/examples/tests/curl_test.ts11
-rw-r--r--std/examples/tests/echo_server_test.ts8
5 files changed, 11 insertions, 31 deletions
diff --git a/std/examples/chat/server.ts b/std/examples/chat/server.ts
index d28f9f43f..08aede05b 100644
--- a/std/examples/chat/server.ts
+++ b/std/examples/chat/server.ts
@@ -29,9 +29,7 @@ async function wsHandler(ws: WebSocket): Promise<void> {
}
}
-const addr = Deno.args[0] ?? "127.0.0.1:8080";
-
-listenAndServe(addr, async req => {
+listenAndServe({ port: 8080 }, async req => {
if (req.method === "GET" && req.url === "/") {
//Serve with hack
const u = new URL("./index.html", import.meta.url);
@@ -77,4 +75,4 @@ listenAndServe(addr, async req => {
}
}
});
-console.log(`chat server starting on ${addr}....`);
+console.log("chat server starting on :8080....");
diff --git a/std/examples/chat/server_test.ts b/std/examples/chat/server_test.ts
index e09771e52..13a5c337c 100644
--- a/std/examples/chat/server_test.ts
+++ b/std/examples/chat/server_test.ts
@@ -3,22 +3,13 @@ import { assert, assertEquals } from "../../testing/asserts.ts";
import { TextProtoReader } from "../../textproto/mod.ts";
import { BufReader } from "../../io/bufio.ts";
import { connectWebSocket, WebSocket } from "../../ws/mod.ts";
-import { randomPort } from "../../http/test_util.ts";
import { delay } from "../../util/async.ts";
-const port = randomPort();
-
const { test, build } = Deno;
async function startServer(): Promise<Deno.Process> {
const server = Deno.run({
- cmd: [
- Deno.execPath(),
- "--allow-net",
- "--allow-read",
- "server.ts",
- `127.0.0.1:${port}`
- ],
+ cmd: [Deno.execPath(), "--allow-net", "--allow-read", "server.ts"],
cwd: "examples/chat",
stdout: "piped"
});
@@ -44,7 +35,7 @@ test({
async fn() {
const server = await startServer();
try {
- const resp = await fetch(`http://127.0.0.1:${port}/`);
+ const resp = await fetch("http://127.0.0.1:8080/");
assertEquals(resp.status, 200);
assertEquals(resp.headers.get("content-type"), "text/html");
const html = await resp.body.text();
@@ -64,7 +55,7 @@ test({
const server = await startServer();
let ws: WebSocket | undefined;
try {
- ws = await connectWebSocket(`http://127.0.0.1:${port}/ws`);
+ ws = await connectWebSocket("http://127.0.0.1:8080/ws");
const it = ws.receive();
assertEquals((await it.next()).value, "Connected: [1]");
ws.send("Hello");
diff --git a/std/examples/echo_server.ts b/std/examples/echo_server.ts
index cdd98fea7..dbcc9b5ae 100644
--- a/std/examples/echo_server.ts
+++ b/std/examples/echo_server.ts
@@ -1,6 +1,6 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
const hostname = "0.0.0.0";
-const port = +(Deno.args[0] ?? "8080");
+const port = 8080;
const listener = Deno.listen({ hostname, port });
console.log(`Listening on ${hostname}:${port}`);
for await (const conn of listener) {
diff --git a/std/examples/tests/curl_test.ts b/std/examples/tests/curl_test.ts
index 3e3d4f78a..8d7634525 100644
--- a/std/examples/tests/curl_test.ts
+++ b/std/examples/tests/curl_test.ts
@@ -1,13 +1,11 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import { serve } from "../../http/server.ts";
import { assertStrictEq } from "../../testing/asserts.ts";
-import { randomPort } from "../../http/test_util.ts";
-const port = randomPort();
Deno.test({
name: "[examples/curl] send a request to a specified url",
fn: async () => {
- const server = serve({ port });
+ const server = serve({ port: 8081 });
const serverPromise = (async (): Promise<void> => {
for await (const req of server) {
req.respond({ body: "Hello world" });
@@ -16,12 +14,7 @@ Deno.test({
const decoder = new TextDecoder();
const process = Deno.run({
- cmd: [
- Deno.execPath(),
- "--allow-net",
- "curl.ts",
- "http://localhost:" + port
- ],
+ cmd: [Deno.execPath(), "--allow-net", "curl.ts", "http://localhost:8081"],
cwd: "examples",
stdout: "piped"
});
diff --git a/std/examples/tests/echo_server_test.ts b/std/examples/tests/echo_server_test.ts
index 164f65357..dd7336023 100644
--- a/std/examples/tests/echo_server_test.ts
+++ b/std/examples/tests/echo_server_test.ts
@@ -1,14 +1,12 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import { assertStrictEq, assertNotEquals } from "../../testing/asserts.ts";
import { BufReader, ReadLineResult } from "../../io/bufio.ts";
-import { randomPort } from "../../http/test_util.ts";
-const port = randomPort();
Deno.test("[examples/echo_server]", async () => {
const encoder = new TextEncoder();
const decoder = new TextDecoder();
const process = Deno.run({
- cmd: [Deno.execPath(), "--allow-net", "echo_server.ts", `${port}`],
+ cmd: [Deno.execPath(), "--allow-net", "echo_server.ts"],
cwd: "examples",
stdout: "piped"
});
@@ -21,10 +19,10 @@ Deno.test("[examples/echo_server]", async () => {
assertNotEquals(message, Deno.EOF);
assertStrictEq(
decoder.decode((message as ReadLineResult).line).trim(),
- "Listening on 0.0.0.0:" + port
+ "Listening on 0.0.0.0:8080"
);
- conn = await Deno.connect({ hostname: "127.0.0.1", port });
+ conn = await Deno.connect({ hostname: "127.0.0.1", port: 8080 });
const connReader = new BufReader(conn);
await conn.write(encoder.encode("Hello echo_server\n"));