Merge branch 'master' into issue6626

Rdatatable · Feb 10, 2025 · 9e0767f · 9e0767f
2 parents 63369a1 + 00d53f4
commit 9e0767f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/R/test.data.table.R b/R/test.data.table.R
@@ -384,8 +384,11 @@ test = function(num,x,y=TRUE,error=NULL,warning=NULL,message=NULL,output=NULL,no
        assign("lasttime", proc.time()[3L], parent.frame(), inherits=TRUE)  # after gc() to exclude gc() time from next test when memtest
     }, add=TRUE )
     if (showProgress) {
+      # nocov start
       cat("\r") # notranslate: \r can't be in gettextf msg
-      catf("Running test id", numStr, "         ")   # nocov.
+      catf("Running test id %s", numStr)
+      cat("         ")   # notranslate
+      # nocov end
     }
     # See PR #4090 for comments about change here in Dec 2019.
     # If a segfault error occurs in future and we'd like to know after which test, then arrange for the

diff --git a/inst/tests/tests.Rraw b/inst/tests/tests.Rraw
@@ -7888,7 +7888,7 @@ test(1551.5, fread(str),
 rhs = setDT(read.table(testDir("issue_1095_fread.txt.bz2"), sep=",", comment.char="", stringsAsFactors=FALSE, quote="", strip.white=TRUE))
 if (test_R.utils) {
   test(1551.61, fread(testDir("issue_1095_fread.txt.bz2"), logical01=FALSE), rhs, warning=w)
-  rhs[, names(.SD) := lapply(.SD, \(x) x == "Y"), .SDcols = c("V16", "V17", "V45")]
+  rhs[, names(.SD) := lapply(.SD, function(x) x == "Y"), .SDcols = c("V16", "V17", "V45")]
   test(1551.62, fread(testDir("issue_1095_fread.txt.bz2"), logical01=FALSE, logicalYN=TRUE), rhs, warning=w)
 }