From beef08952e51a7883d8ef191275abfb72d100932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sat, 30 Mar 2024 20:17:56 +0100 Subject: [PATCH 1/2] docs: Bump roxygen2 version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 33537fc7f..f0cfdf3f9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -55,7 +55,7 @@ Config/Needs/check: decor Encoding: UTF-8 KeepSource: true Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.0.9000 +RoxygenNote: 7.3.1 Collate: 'DBItest.R' 'compat-purrr.R' From 3378950b4e6f55cbec20e8b44b23f363403fe86f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sat, 30 Mar 2024 20:18:12 +0100 Subject: [PATCH 2/2] feat: Allow multiple warnings in disconnect tests --- R/spec-connection-disconnect.R | 6 +++--- man/spec_connection_disconnect.Rd | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/R/spec-connection-disconnect.R b/R/spec-connection-disconnect.R index 7e3231bce..94f4a45ae 100644 --- a/R/spec-connection-disconnect.R +++ b/R/spec-connection-disconnect.R @@ -23,14 +23,14 @@ spec_connection_disconnect <- list( #' but this cannot be tested automatically. disconnect_closed_connection = function(ctx, closed_con) { - #' A warning is issued immediately when calling `dbDisconnect()` on an + #' At least one warning is issued immediately when calling `dbDisconnect()` on an #' already disconnected - expect_warning(dbDisconnect(closed_con)) + suppressWarnings(expect_warning(dbDisconnect(closed_con))) }, disconnect_invalid_connection = function(ctx, invalid_con) { #' or invalid connection. - expect_warning(dbDisconnect(invalid_con)) + suppressWarnings(expect_warning(dbDisconnect(invalid_con))) }, # NULL diff --git a/man/spec_connection_disconnect.Rd b/man/spec_connection_disconnect.Rd index afa012c45..23b346729 100644 --- a/man/spec_connection_disconnect.Rd +++ b/man/spec_connection_disconnect.Rd @@ -15,7 +15,7 @@ spec_connection_disconnect A warning is issued on garbage collection when a connection has been released without calling \code{dbDisconnect()}, but this cannot be tested automatically. -A warning is issued immediately when calling \code{dbDisconnect()} on an +At least one warning is issued immediately when calling \code{dbDisconnect()} on an already disconnected or invalid connection. }