Skip to content

Commit f23d86d

Browse files
committed
Fix warnings on more recent Elixir versions
1 parent 975a5ac commit f23d86d

3 files changed

Lines changed: 13 additions & 39 deletions

File tree

config/config.exs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@ if Mix.env() == :test do
55
418 => "Totally not a teapot",
66
998 => "Not An RFC Status Code"
77
}
8+
9+
config :logger, :console,
10+
colors: [enabled: false],
11+
metadata: [:request_id]
812
end

test/plug/cowboy/conn_test.exs

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@ defmodule Plug.Cowboy.ConnTest do
160160
raise "BadTimes"
161161
end
162162

163+
def telemetry_send(event, measurements, metadata, test) do
164+
send(test, {:telemetry, event, measurements, metadata})
165+
end
166+
163167
test "emits telemetry events for start/stop" do
164168
:telemetry.attach_many(
165169
:start_stop_test,
@@ -168,9 +172,7 @@ defmodule Plug.Cowboy.ConnTest do
168172
[:cowboy, :request, :stop],
169173
[:cowboy, :request, :exception]
170174
],
171-
fn event, measurements, metadata, test ->
172-
send(test, {:telemetry, event, measurements, metadata})
173-
end,
175+
&__MODULE__.telemetry_send/4,
174176
self()
175177
)
176178

@@ -194,16 +196,15 @@ defmodule Plug.Cowboy.ConnTest do
194196
:telemetry.detach(:start_stop_test)
195197
end
196198

199+
@tag :capture_log
197200
test "emits telemetry events for exception" do
198201
:telemetry.attach_many(
199202
:exception_test,
200203
[
201204
[:cowboy, :request, :start],
202205
[:cowboy, :request, :exception]
203206
],
204-
fn event, measurements, metadata, test ->
205-
send(test, {:telemetry, event, measurements, metadata})
206-
end,
207+
&__MODULE__.telemetry_send/4,
207208
self()
208209
)
209210

@@ -221,9 +222,7 @@ defmodule Plug.Cowboy.ConnTest do
221222
:telemetry.attach(
222223
:early_error_test,
223224
[:cowboy, :request, :early_error],
224-
fn name, measurements, metadata, test ->
225-
send(test, {:event, name, measurements, metadata})
226-
end,
225+
&__MODULE__.telemetry_send/4,
227226
self()
228227
)
229228

@@ -234,7 +233,7 @@ defmodule Plug.Cowboy.ConnTest do
234233
assert {200, _, _} = request(:get, "/headers", [{"foo", "bar"}, {"baz", "bat"}])
235234
end) =~ "Cowboy returned 431 because it was unable to parse the request headers"
236235

237-
assert_receive {:event, [:cowboy, :request, :early_error],
236+
assert_receive {:telemetry, [:cowboy, :request, :early_error],
238237
%{
239238
system_time: _
240239
},
@@ -611,34 +610,6 @@ defmodule Plug.Cowboy.ConnTest do
611610
"malformed request, a RuntimeError exception was raised with message \"invalid multipart"
612611
end
613612

614-
def https(conn) do
615-
assert conn.scheme == :https
616-
send_resp(conn, 200, "OK")
617-
end
618-
619-
test "https" do
620-
pool = :https
621-
pool_opts = [timeout: 150_000, max_connections: 10]
622-
:ok = :hackney_pool.start_pool(pool, pool_opts)
623-
624-
opts = [
625-
pool: :https,
626-
ssl_options: [cacertfile: @https_options[:certfile], server_name_indication: ~c"localhost"]
627-
]
628-
629-
assert {:ok, 200, _headers, client} =
630-
:hackney.get("https://127.0.0.1:8004/https", [], "", opts)
631-
632-
assert {:ok, "OK"} = :hackney.body(client)
633-
:hackney.close(client)
634-
end
635-
636-
@http2_opts [
637-
cacertfile: @https_options[:certfile],
638-
server_name_indication: ~c"localhost",
639-
port: 8004
640-
]
641-
642613
def http2(conn) do
643614
case conn.query_string do
644615
"noinfer" <> _ ->

test/test_helper.exs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
ExUnit.start(assert_receive_timeout: 1000)
2-
Logger.configure_backend(:console, colors: [enabled: false], metadata: [:request_id])

0 commit comments

Comments
 (0)