Skip to content

Commit 79143bb

Browse files
nathanlnathanl
authored
More label usage (elixir-ecto#338)
Whenever possible, have error messages that include a PID also include the process label, name, or initial call.
1 parent 1b9783d commit 79143bb

File tree

14 files changed

+184
-104
lines changed

14 files changed

+184
-104
lines changed

‎integration_test/cases/after_connect_test.exs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -212,17 +212,18 @@ defmodule AfterConnectTest do
212212

213213
assert_receive {:after_connect, after_pid}
214214

215-
prefix =
216-
"client #{inspect(after_pid)} stopped: " <>
217-
"** (DBConnection.ConnectionError) bad return value: :oops"
218-
219-
len = byte_size(prefix)
215+
pid_str = inspect(after_pid)
220216

221217
assert_receive {:EXIT, ^conn,
222218
{%DBConnection.ConnectionError{
223-
message: <<^prefix::binary-size(len), _::binary>>
219+
message: message
224220
}, [_ | _]}}
225221

222+
assert Regex.match?(
223+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(DBConnection\.ConnectionError\) bad return value: :oops/,
224+
message
225+
)
226+
226227
assert [
227228
{:connect, _},
228229
{:handle_status, _},
@@ -266,14 +267,18 @@ defmodule AfterConnectTest do
266267
assert_receive {:hi, conn}
267268

268269
assert_receive {:after_connect, after_pid}
269-
prefix = "client #{inspect(after_pid)} stopped: ** (RuntimeError) oops"
270-
len = byte_size(prefix)
270+
pid_str = inspect(after_pid)
271271

272272
assert_receive {:EXIT, ^conn,
273273
{%DBConnection.ConnectionError{
274-
message: <<^prefix::binary-size(len), _::binary>>
274+
message: message
275275
}, [_ | _]}}
276276

277+
assert Regex.match?(
278+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(RuntimeError\) oops/,
279+
message
280+
)
281+
277282
assert [
278283
{:connect, _},
279284
{:handle_status, _},

‎integration_test/cases/execute_test.exs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -432,17 +432,18 @@ defmodule ExecuteTest do
432432
P.execute(pool, %Q{}, [:param])
433433
end
434434

435-
prefix =
436-
"client #{inspect(self())} stopped: " <>
437-
"** (DBConnection.ConnectionError) bad return value: :oops"
438-
439-
len = byte_size(prefix)
435+
pid_str = inspect(self())
440436

441437
assert_receive {:EXIT, ^conn,
442438
{%DBConnection.ConnectionError{
443-
message: <<^prefix::binary-size(len), _::binary>>
439+
message: message
444440
}, [_ | _]}}
445441

442+
assert Regex.match?(
443+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(DBConnection\.ConnectionError\) bad return value: :oops/,
444+
message
445+
)
446+
446447
assert [
447448
{:connect, _},
448449
{:handle_execute, [%Q{}, [:param], _, :state]},
@@ -473,14 +474,18 @@ defmodule ExecuteTest do
473474
Process.flag(:trap_exit, true)
474475
assert_raise RuntimeError, "oops", fn -> P.execute(pool, %Q{}, [:param]) end
475476

476-
prefix = "client #{inspect(self())} stopped: ** (RuntimeError) oops"
477-
len = byte_size(prefix)
477+
pid_str = inspect(self())
478478

479479
assert_receive {:EXIT, ^conn,
480480
{%DBConnection.ConnectionError{
481-
message: <<^prefix::binary-size(len), _::binary>>
481+
message: message
482482
}, [_ | _]}}
483483

484+
assert Regex.match?(
485+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(RuntimeError\) oops/,
486+
message
487+
)
488+
484489
assert [
485490
{:connect, _},
486491
{:handle_execute, [%Q{}, [:param], _, :state]},

‎integration_test/cases/prepare_stream_test.exs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -286,17 +286,18 @@ defmodule PrepareStreamTest do
286286
:hi
287287
end) == {:error, :rollback}
288288

289-
prefix =
290-
"client #{inspect(self())} stopped: " <>
291-
"** (DBConnection.ConnectionError) bad return value: :oops"
292-
293-
len = byte_size(prefix)
289+
pid_str = inspect(self())
294290

295291
assert_receive {:EXIT, ^conn,
296292
{%DBConnection.ConnectionError{
297-
message: <<^prefix::binary-size(len), _::binary>>
293+
message: message
298294
}, [_ | _]}}
299295

296+
assert Regex.match?(
297+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(DBConnection\.ConnectionError\) bad return value: :oops/,
298+
message
299+
)
300+
300301
assert [
301302
{:connect, _},
302303
{:handle_begin, [_, :state]},
@@ -336,14 +337,18 @@ defmodule PrepareStreamTest do
336337
:hi
337338
end) == {:error, :rollback}
338339

339-
prefix = "client #{inspect(self())} stopped: ** (RuntimeError) oops"
340-
len = byte_size(prefix)
340+
pid_str = inspect(self())
341341

342342
assert_receive {:EXIT, ^conn,
343343
{%DBConnection.ConnectionError{
344-
message: <<^prefix::binary-size(len), _::binary>>
344+
message: message
345345
}, [_ | _]}}
346346

347+
assert Regex.match?(
348+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(RuntimeError\) oops/,
349+
message
350+
)
351+
347352
assert [
348353
{:connect, _},
349354
{:handle_begin, [_, :state]},

‎integration_test/cases/stream_test.exs‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -432,17 +432,18 @@ defmodule StreamTest do
432432
:hi
433433
end) == {:error, :rollback}
434434

435-
prefix =
436-
"client #{inspect(self())} stopped: " <>
437-
"** (DBConnection.ConnectionError) bad return value: :oops"
438-
439-
len = byte_size(prefix)
435+
pid_str = inspect(self())
440436

441437
assert_receive {:EXIT, ^conn,
442438
{%DBConnection.ConnectionError{
443-
message: <<^prefix::binary-size(len), _::binary>>
439+
message: message
444440
}, [_ | _]}}
445441

442+
assert Regex.match?(
443+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(DBConnection\.ConnectionError\) bad return value: :oops/,
444+
message
445+
)
446+
446447
assert [
447448
{:connect, _},
448449
{:handle_begin, [_, :state]},
@@ -481,14 +482,18 @@ defmodule StreamTest do
481482
:hi
482483
end) == {:error, :rollback}
483484

484-
prefix = "client #{inspect(self())} stopped: ** (RuntimeError) oops"
485-
len = byte_size(prefix)
485+
pid_str = inspect(self())
486486

487487
assert_receive {:EXIT, ^conn,
488488
{%DBConnection.ConnectionError{
489-
message: <<^prefix::binary-size(len), _::binary>>
489+
message: message
490490
}, [_ | _]}}
491491

492+
assert Regex.match?(
493+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(RuntimeError\) oops/,
494+
message
495+
)
496+
492497
assert [
493498
{:connect, _},
494499
{:handle_begin, [_, :state]},
@@ -567,17 +572,18 @@ defmodule StreamTest do
567572
:hi
568573
end) == {:error, :rollback}
569574

570-
prefix =
571-
"client #{inspect(self())} stopped: " <>
572-
"** (DBConnection.ConnectionError) bad return value: :oops"
573-
574-
len = byte_size(prefix)
575+
pid_str = inspect(self())
575576

576577
assert_receive {:EXIT, ^conn,
577578
{%DBConnection.ConnectionError{
578-
message: <<^prefix::binary-size(len), _::binary>>
579+
message: message
579580
}, [_ | _]}}
580581

582+
assert Regex.match?(
583+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(DBConnection\.ConnectionError\) bad return value: :oops/,
584+
message
585+
)
586+
581587
assert [
582588
{:connect, _},
583589
{:handle_begin, [_, :state]},
@@ -619,14 +625,18 @@ defmodule StreamTest do
619625
:hi
620626
end) == {:error, :rollback}
621627

622-
prefix = "client #{inspect(self())} stopped: ** (RuntimeError) oops"
623-
len = byte_size(prefix)
628+
pid_str = inspect(self())
624629

625630
assert_receive {:EXIT, ^conn,
626631
{%DBConnection.ConnectionError{
627-
message: <<^prefix::binary-size(len), _::binary>>
632+
message: message
628633
}, [_ | _]}}
629634

635+
assert Regex.match?(
636+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(RuntimeError\) oops/,
637+
message
638+
)
639+
630640
assert [
631641
{:connect, _},
632642
{:handle_begin, [_, :state]},

‎integration_test/cases/transaction_execute_test.exs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,18 @@ defmodule TransactionExecuteTest do
213213
:closed
214214
end) == {:error, :rollback}
215215

216-
prefix =
217-
"client #{inspect(self())} stopped: " <>
218-
"** (DBConnection.ConnectionError) bad return value: :oops"
219-
220-
len = byte_size(prefix)
216+
pid_str = inspect(self())
221217

222218
assert_receive {:EXIT, ^conn,
223219
{%DBConnection.ConnectionError{
224-
message: <<^prefix::binary-size(len), _::binary>>
220+
message: message
225221
}, [_ | _]}}
226222

223+
assert Regex.match?(
224+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(DBConnection\.ConnectionError\) bad return value: :oops/,
225+
message
226+
)
227+
227228
assert [
228229
{:connect, _},
229230
{:handle_begin, [_, :state]},
@@ -267,14 +268,18 @@ defmodule TransactionExecuteTest do
267268
:closed
268269
end) == {:error, :rollback}
269270

270-
prefix = "client #{inspect(self())} stopped: ** (RuntimeError) oops"
271-
len = byte_size(prefix)
271+
pid_str = inspect(self())
272272

273273
assert_receive {:EXIT, ^conn,
274274
{%DBConnection.ConnectionError{
275-
message: <<^prefix::binary-size(len), _::binary>>
275+
message: message
276276
}, [_ | _]}}
277277

278+
assert Regex.match?(
279+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(RuntimeError\) oops/,
280+
message
281+
)
282+
278283
assert [
279284
{:connect, _},
280285
{:handle_begin, [_, :state]},

‎integration_test/cases/transaction_test.exs‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -523,17 +523,18 @@ defmodule TransactionTest do
523523
P.transaction(pool, fn _ -> flunk("transaction ran") end)
524524
end
525525

526-
prefix =
527-
"client #{inspect(self())} stopped: " <>
528-
"** (DBConnection.ConnectionError) bad return value: :oops"
529-
530-
len = byte_size(prefix)
526+
pid_str = inspect(self())
531527

532528
assert_receive {:EXIT, ^conn,
533529
{%DBConnection.ConnectionError{
534-
message: <<^prefix::binary-size(len), _::binary>>
530+
message: message
535531
}, [_ | _]}}
536532

533+
assert Regex.match?(
534+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(DBConnection\.ConnectionError\) bad return value: :oops/,
535+
message
536+
)
537+
537538
assert [
538539
{:connect, _},
539540
{:handle_begin, [_, :state]},
@@ -567,14 +568,18 @@ defmodule TransactionTest do
567568
P.transaction(pool, fn _ -> flunk("transaction ran") end)
568569
end
569570

570-
prefix = "client #{inspect(self())} stopped: ** (RuntimeError) oops"
571-
len = byte_size(prefix)
571+
pid_str = inspect(self())
572572

573573
assert_receive {:EXIT, ^conn,
574574
{%DBConnection.ConnectionError{
575-
message: <<^prefix::binary-size(len), _::binary>>
575+
message: message
576576
}, [_ | _]}}
577577

578+
assert Regex.match?(
579+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(RuntimeError\) oops/,
580+
message
581+
)
582+
578583
assert [
579584
{:connect, _},
580585
{:handle_begin, [_, :state]},
@@ -709,17 +714,18 @@ defmodule TransactionTest do
709714
P.transaction(pool, fn _ -> :result end)
710715
end
711716

712-
prefix =
713-
"client #{inspect(self())} stopped: " <>
714-
"** (DBConnection.ConnectionError) bad return value: :oops"
715-
716-
len = byte_size(prefix)
717+
pid_str = inspect(self())
717718

718719
assert_receive {:EXIT, ^conn,
719720
{%DBConnection.ConnectionError{
720-
message: <<^prefix::binary-size(len), _::binary>>
721+
message: message
721722
}, [_ | _]}}
722723

724+
assert Regex.match?(
725+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(DBConnection\.ConnectionError\) bad return value: :oops/,
726+
message
727+
)
728+
723729
assert [
724730
{:connect, _},
725731
{:handle_begin, [_, :state]},
@@ -752,14 +758,18 @@ defmodule TransactionTest do
752758
Process.flag(:trap_exit, true)
753759
assert_raise RuntimeError, "oops", fn -> P.transaction(pool, fn _ -> :result end) end
754760

755-
prefix = "client #{inspect(self())} stopped: ** (RuntimeError) oops"
756-
len = byte_size(prefix)
761+
pid_str = inspect(self())
757762

758763
assert_receive {:EXIT, ^conn,
759764
{%DBConnection.ConnectionError{
760-
message: <<^prefix::binary-size(len), _::binary>>
765+
message: message
761766
}, [_ | _]}}
762767

768+
assert Regex.match?(
769+
~r/^client #{Regex.escape(pid_str)}(?<optional_pid_info>\s*\([^)]+\))?\s+stopped: \*\* \(RuntimeError\) oops/,
770+
message
771+
)
772+
763773
assert [
764774
{:connect, _},
765775
{:handle_begin, [_, :state]},

0 commit comments

Comments
 (0)