Reaction to changes to packages

Author: StuartWheater

tests/testthat/test-arg-ds.foobar.R

@@ -29,9 +29,9 @@ test_that("setup", {
 test_that("NULL connections", {
     calltext <- call("fooBarDS")
     if (ds.test_env$driver == "ArmadilloDriver") {
-        expect_error(datashield.aggregate(conns=NULL, expr=calltext), "unable to find an inherited method for function 'dsIsAsync' for signature 'conn = \"NULL\"'", fixed=TRUE)
+        expect_error(datashield.aggregate(conns=NULL, expr=calltext), "unable to find an inherited method for function ‘dsIsAsync’ for signature ‘conn = \"NULL\"’", fixed=TRUE)
     } else if (ds.test_env$driver == "OpalDriver") {
-        expect_error(datashield.aggregate(conns=NULL, expr=calltext), "unable to find an inherited method for function 'dsIsAsync' for signature 'conn = \"NULL\"'", fixed=TRUE)
+        expect_error(datashield.aggregate(conns=NULL, expr=calltext), "unable to find an inherited method for function ‘dsIsAsync’ for signature ‘conn = \"NULL\"’", fixed=TRUE)
     } else {
         fail(message = "Unknown driver type", info = ds.test_env$driver)
     }
@@ -69,9 +69,9 @@ test_that("non existent aggregate foobarDS", {
 test_that("NULL connections", {
     calltext <- call("fooBarDS")
     if (ds.test_env$driver == "ArmadilloDriver") {
-        expect_error(datashield.assign(conns=NULL, symbol="new_obj", value=calltext), "unable to find an inherited method for function 'dsIsAsync' for signature 'conn = \"NULL\"'", fixed=TRUE)
+        expect_error(datashield.assign(conns=NULL, symbol="new_obj", value=calltext), "unable to find an inherited method for function ‘dsIsAsync’ for signature ‘conn = \"NULL\"'", fixed=TRUE)
     } else if (ds.test_env$driver == "OpalDriver") {
-        expect_error(datashield.assign(conns=NULL, symbol="new_obj", value=calltext), "unable to find an inherited method for function 'dsIsAsync' for signature 'conn = \"NULL\"'", fixed=TRUE)
+        expect_error(datashield.assign(conns=NULL, symbol="new_obj", value=calltext), "unable to find an inherited method for function ‘dsIsAsync’ for signature ‘conn = \"NULL\"’", fixed=TRUE)
     } else {
         fail(message = "Unknown driver type", info = ds.test_env$driver)
     }

tests/testthat/test-smk-ds.colnames.R

@@ -47,7 +47,7 @@ test_that("simple colnames", {
 test_that("fails if the object does not exist", {
   expect_error(
     ds.colnames("non_existing_df"),
-    regexp = "There are some DataSHIELD errors, list them with datashield.error()",
+    regexp = "The input object non_existing_df is not defined in sim1, sim2, sim3!",
     ignore.case = TRUE
   )
 })