diff options
Diffstat (limited to 'cli')
-rw-r--r-- | cli/tests/testdata/cert/listen_tls_alpn.ts | 4 | ||||
-rw-r--r-- | cli/tests/testdata/cert/listen_tls_alpn_fail.ts | 4 | ||||
-rw-r--r-- | cli/tests/testdata/run/tls_connecttls.js | 4 | ||||
-rw-r--r-- | cli/tests/testdata/run/tls_starttls.js | 4 | ||||
-rw-r--r-- | cli/tests/unit/http_test.ts | 12 | ||||
-rw-r--r-- | cli/tests/unit/tls_test.ts | 28 |
6 files changed, 28 insertions, 28 deletions
diff --git a/cli/tests/testdata/cert/listen_tls_alpn.ts b/cli/tests/testdata/cert/listen_tls_alpn.ts index b3ade686e..6b92364ba 100644 --- a/cli/tests/testdata/cert/listen_tls_alpn.ts +++ b/cli/tests/testdata/cert/listen_tls_alpn.ts @@ -1,7 +1,7 @@ const listener = Deno.listenTls({ port: Number(Deno.args[0]), - certFile: "./tls/localhost.crt", - keyFile: "./tls/localhost.key", + cert: Deno.readTextFileSync("./tls/localhost.crt"), + key: Deno.readTextFileSync("./tls/localhost.key"), alpnProtocols: ["h2", "http/1.1", "foobar"], }); diff --git a/cli/tests/testdata/cert/listen_tls_alpn_fail.ts b/cli/tests/testdata/cert/listen_tls_alpn_fail.ts index c1aa4b31d..e321c9bd3 100644 --- a/cli/tests/testdata/cert/listen_tls_alpn_fail.ts +++ b/cli/tests/testdata/cert/listen_tls_alpn_fail.ts @@ -2,8 +2,8 @@ import { assertRejects } from "../../../../test_util/std/assert/mod.ts"; const listener = Deno.listenTls({ port: Number(Deno.args[0]), - certFile: "./tls/localhost.crt", - keyFile: "./tls/localhost.key", + cert: Deno.readTextFileSync("./tls/localhost.crt"), + key: Deno.readTextFileSync("./tls/localhost.key"), alpnProtocols: ["h2", "http/1.1", "foobar"], }); diff --git a/cli/tests/testdata/run/tls_connecttls.js b/cli/tests/testdata/run/tls_connecttls.js index 18a0783fc..8c6c285f3 100644 --- a/cli/tests/testdata/run/tls_connecttls.js +++ b/cli/tests/testdata/run/tls_connecttls.js @@ -12,8 +12,8 @@ const port = 3505; const listener = Deno.listenTls({ hostname, port, - certFile: "./tls/localhost.crt", - keyFile: "./tls/localhost.key", + cert: Deno.readTextFileSync("./tls/localhost.crt"), + key: Deno.readTextFileSync("./tls/localhost.key"), }); const response = encoder.encode( diff --git a/cli/tests/testdata/run/tls_starttls.js b/cli/tests/testdata/run/tls_starttls.js index 3d84ac74a..3e406ff5f 100644 --- a/cli/tests/testdata/run/tls_starttls.js +++ b/cli/tests/testdata/run/tls_starttls.js @@ -13,8 +13,8 @@ const port = 3504; const listener = Deno.listenTls({ hostname, port, - certFile: "./tls/localhost.crt", - keyFile: "./tls/localhost.key", + cert: Deno.readTextFileSync("./tls/localhost.crt"), + key: Deno.readTextFileSync("./tls/localhost.key"), }); const response = encoder.encode( diff --git a/cli/tests/unit/http_test.ts b/cli/tests/unit/http_test.ts index bd4c8da09..acdaef903 100644 --- a/cli/tests/unit/http_test.ts +++ b/cli/tests/unit/http_test.ts @@ -326,8 +326,8 @@ Deno.test( const listener = Deno.listenTls({ hostname, port, - certFile: "cli/tests/testdata/tls/localhost.crt", - keyFile: "cli/tests/testdata/tls/localhost.key", + cert: Deno.readTextFileSync("cli/tests/testdata/tls/localhost.crt"), + key: Deno.readTextFileSync("cli/tests/testdata/tls/localhost.key"), }); const conn = await listener.accept(); const httpConn = Deno.serveHttp(conn); @@ -2294,8 +2294,8 @@ Deno.test( const listener = Deno.listenTls({ hostname, port, - certFile: "cli/tests/testdata/tls/localhost.crt", - keyFile: "cli/tests/testdata/tls/localhost.key", + cert: await Deno.readTextFile("cli/tests/testdata/tls/localhost.crt"), + key: await Deno.readTextFile("cli/tests/testdata/tls/localhost.key"), }); const caCerts = [ @@ -2600,8 +2600,8 @@ for (const compression of [true, false]) { const listener = Deno.listenTls({ hostname, port, - certFile: "cli/tests/testdata/tls/localhost.crt", - keyFile: "cli/tests/testdata/tls/localhost.key", + cert: await Deno.readTextFile("cli/tests/testdata/tls/localhost.crt"), + key: await Deno.readTextFile("cli/tests/testdata/tls/localhost.key"), alpnProtocols: ["h2"], }); const server = httpServerWithErrorBody(listener, compression); diff --git a/cli/tests/unit/tls_test.ts b/cli/tests/unit/tls_test.ts index 8ab41b81a..2e797b160 100644 --- a/cli/tests/unit/tls_test.ts +++ b/cli/tests/unit/tls_test.ts @@ -183,8 +183,8 @@ Deno.test( const listener = Deno.listenTls({ hostname, port, - certFile: "cli/tests/testdata/tls/localhost.crt", - keyFile: "cli/tests/testdata/tls/localhost.key", + cert: await Deno.readTextFile("cli/tests/testdata/tls/localhost.crt"), + key: await Deno.readTextFile("cli/tests/testdata/tls/localhost.key"), }); const response = encoder.encode( @@ -296,8 +296,8 @@ async function tlsPair(): Promise<[Deno.Conn, Deno.Conn]> { const listener = Deno.listenTls({ hostname: "localhost", port, - certFile: "cli/tests/testdata/tls/localhost.crt", - keyFile: "cli/tests/testdata/tls/localhost.key", + cert: await Deno.readTextFile("cli/tests/testdata/tls/localhost.crt"), + key: await Deno.readTextFile("cli/tests/testdata/tls/localhost.key"), }); const acceptPromise = listener.accept(); @@ -320,8 +320,8 @@ async function tlsAlpn( const listener = Deno.listenTls({ hostname: "localhost", port, - certFile: "cli/tests/testdata/tls/localhost.crt", - keyFile: "cli/tests/testdata/tls/localhost.key", + cert: await Deno.readTextFile("cli/tests/testdata/tls/localhost.crt"), + key: await Deno.readTextFile("cli/tests/testdata/tls/localhost.key"), alpnProtocols: ["deno", "rocks"], }); @@ -725,8 +725,8 @@ async function tlsWithTcpFailureTestImpl( const tlsListener = Deno.listenTls({ hostname: "localhost", port: tlsPort, - certFile: "cli/tests/testdata/tls/localhost.crt", - keyFile: "cli/tests/testdata/tls/localhost.key", + cert: await Deno.readTextFile("cli/tests/testdata/tls/localhost.crt"), + key: await Deno.readTextFile("cli/tests/testdata/tls/localhost.key"), }); const tcpPort = getPort(); @@ -1019,8 +1019,8 @@ function createHttpsListener(port: number): Deno.Listener { const listener = Deno.listenTls({ hostname: "localhost", port, - certFile: "./cli/tests/testdata/tls/localhost.crt", - keyFile: "./cli/tests/testdata/tls/localhost.key", + cert: Deno.readTextFileSync("./cli/tests/testdata/tls/localhost.crt"), + key: Deno.readTextFileSync("./cli/tests/testdata/tls/localhost.key"), }); serve(listener); @@ -1285,8 +1285,8 @@ Deno.test( const listener = Deno.listenTls({ hostname, port, - certFile: "cli/tests/testdata/tls/localhost.crt", - keyFile: "cli/tests/testdata/tls/localhost.key", + cert: await Deno.readTextFile("cli/tests/testdata/tls/localhost.crt"), + key: await Deno.readTextFile("cli/tests/testdata/tls/localhost.key"), }); const acceptPromise = listener.accept(); const connectPromise = Deno.connectTls({ @@ -1354,8 +1354,8 @@ Deno.test( const listener = Deno.listenTls({ hostname, port, - certFile: "cli/tests/testdata/tls/localhost.crt", - keyFile: "cli/tests/testdata/tls/localhost.key", + cert: Deno.readTextFileSync("cli/tests/testdata/tls/localhost.crt"), + key: Deno.readTextFileSync("cli/tests/testdata/tls/localhost.key"), }); for await (const conn of listener) { for (let i = 0; i < 10; i++) { |