ensures propper cleanup after each AppenderFile in tests

Author: s-fleck

tests/testthat/test_Appender.R

@@ -39,6 +39,7 @@ test_that("setting appender threshold works", {
 # AppenderFile ---------------------------------------------------------
 test_that("AppenderFile works as expected", {
   tf <- tempfile()
+  on.exit(unlink(tf))
 
   # with default format
   app <- AppenderFile$new(file = tf)
@@ -50,6 +51,7 @@ test_that("AppenderFile works as expected", {
   unlink(tf)
 
   tf <- tempfile()
+  on.exit(unlink(tf))
   # with Json
   app <- AppenderFile$new(file = tf, layout = LayoutJson$new())
   app$append(x)
@@ -61,15 +63,14 @@ test_that("AppenderFile works as expected", {
   expect_identical(tres[["msg"]], eres[["msg"]])
   expect_true(all(is.na(tres[["caller"]])) && all(is.na(eres[["caller"]])))
   expect_equal(as.POSIXct(tres[["timestamp"]]), eres[["timestamp"]], tolerance = 1)
-  unlink(tf)
 })
 
 
 
 
 test_that("AppenderFile creates empty log file on init", {
   tf <- tempfile()
-  on.exit(file.remove(tf))
+  on.exit(unlink(tf))
 
   expect_error(AppenderFile$new(
     file = file.path(tempdir(), "non", "existing", "directory" )
@@ -84,6 +85,7 @@ test_that("AppenderFile creates empty log file on init", {
 
 test_that("AppenderJson show method works as expected", {
   tf <- tempfile()
+  on.exit(unlink(tf))
 
   # with default format
   app <- AppenderJson$new(file = tf)
@@ -98,7 +100,6 @@ test_that("AppenderJson show method works as expected", {
 
   r <- utils::capture.output(app$show(threshold = 100))
   expect_identical(r, "")
-  unlink(tf)
 })
 
 
@@ -246,8 +247,6 @@ test_that("AppenderDt: .custom works", {
       .custom = NA_integer_
     ))
   )
-
-
 })
 
 

tests/testthat/test_Logger.R

@@ -122,7 +122,9 @@ test_that("suspending loggers works", {
 
 
 test_that("add/remove appenders", {
-  ml <- Logger$new("test_logger", appenders = AppenderFile$new(file = tempfile()))
+  tf <- tempfile()
+  on.exit(unlink(tf))
+  ml <- Logger$new("test_logger", appenders = AppenderFile$new(file = tf))
   app1 <- AppenderConsole$new(threshold = 100)
   app2 <- AppenderConsole$new(threshold = 300)
 
@@ -154,6 +156,7 @@ test_that("add/remove appenders", {
 test_that("modify appenders for a logger", {
   ml <- Logger$new("test_logger", appenders = list(AppenderConsole$new()), propagate = FALSE)
   tf <- tempfile()
+  on.exit(unlink(tf))
 
   # Add a new appender to a logger. We don't have to supply a name, but that
   # mak1es it easier to remove later.
@@ -168,16 +171,17 @@ test_that("modify appenders for a logger", {
   expect_silent(ml$debug("A debug message that the console appender doesn't show."))
   expect_identical(length(readLines(tf)), 2L)
   expect_match(paste(readLines(tf), collapse = "---"), "INFO.*---DEBUG.*")
-  file.remove(tf)
 })
 
 
 
 
 test_that("Exceptions are cought and turned into warnings", {
+  tf <- tempfile()
+  on.exit(unlink(tf))
   ml <- Logger$new("test_logger",
     appenders = list(
-      AppenderFile$new(file = tempfile()),
+      AppenderFile$new(file = tf),
       AppenderConsole$new()
     )
   )
@@ -193,6 +197,8 @@ test_that("Logger inheritance and event propagation", {
   tf1 <- tempfile()
   tf2 <- tempfile()
   tf3 <- tempfile()
+  on.exit(unlink(c(tf1, tf2, tf3)))
+
   c1  <- get_logger("c1")
   c1$add_appender(AppenderFile$new(tf1))
 
@@ -227,9 +233,12 @@ test_that("thresholds work", {
 
 
 test_that("ancestry querry works", {
+  tf <- tempfile()
+  on.exit(unlink(tf))
+
   l1 <- Logger$new("l1", appenders = AppenderBuffer$new())
   l2 <- Logger$new("l1/l2", propagate = FALSE, appenders = AppenderConsole$new())
-  l3 <- Logger$new("l1/l2/l3", appenders = AppenderFile$new(tempfile()))
+  l3 <- Logger$new("l1/l2/l3", appenders = AppenderFile$new(tf))
   l4 <- Logger$new("l1/l2/l3/l4", appenders = AppenderBuffer$new())
 
   expect_match(format(l4$ancestry), "(->.*){2}.*|")

tests/testthat/test_simple_logging.R

@@ -70,6 +70,7 @@ test_that("add/remove_appender", {
 
 test_that("option appenders setup", {
   old <- getOption("lgr.log_file")
+  on.exit(options("lgr.log_file" = old))
 
   options("lgr.log_file" = tempfile())
 
@@ -99,6 +100,4 @@ test_that("option appenders setup", {
   options("lgr.log_file" = c(blubb = tempfile('_fail')))
   expect_warning(res <- default_appenders(), "_fail")
   unlink(getOption("lgr.log_file"))
-
-  options("lgr.log_file" = old)
 })