Skip to content

Commit 20c12de

Browse files
committed
Updated for new responses for 'foobar'
1 parent f17fd8a commit 20c12de

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ test_that("setup", {
2929
test_that("NULL connections", {
3030
calltext <- call("fooBarDS")
3131
if (ds.test_env$driver == "ArmadilloDriver") {
32-
expect_error(datashield.aggregate(conns=NULL, expr=calltext), "no applicable method for `@` applied to an object of class \"NULL\"", fixed=TRUE)
33-
# expect_error(datashield.aggregate(conns=NULL, expr=calltext), "trying to get slot \"name\" from an object of a basic class (\"NULL\") with no slots", fixed=TRUE)
32+
expect_error(datashield.aggregate(conns=NULL, expr=calltext), "unable to find an inherited method for function ‘dsIsAsync’ for signature ‘conn = \"NULL\"", fixed=TRUE)
3433
} else if (ds.test_env$driver == "OpalDriver") {
35-
expect_error(datashield.aggregate(conns=NULL, expr=calltext), "no applicable method for `@` applied to an object of class \"NULL\"", fixed=TRUE)
34+
expect_error(datashield.aggregate(conns=NULL, expr=calltext), "unable to find an inherited method for function ‘dsIsAsync’ for signature ‘conn = \"NULL\"", fixed=TRUE)
3635
} else {
3736
fail(message = "Unknown driver type", info = ds.test_env$driver)
3837
}
@@ -70,10 +69,9 @@ test_that("non existent aggregate foobarDS", {
7069
test_that("NULL connections", {
7170
calltext <- call("fooBarDS")
7271
if (ds.test_env$driver == "ArmadilloDriver") {
73-
expect_error(datashield.assign(conns=NULL, symbol="new_obj", value=calltext), "no applicable method for `@` applied to an object of class \"NULL\"", fixed=TRUE)
74-
# expect_error(datashield.assign(conns=NULL, symbol="new_obj", value=calltext), "trying to get slot \"name\" from an object of a basic class (\"NULL\") with no slots", fixed=TRUE)
72+
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)
7573
} else if (ds.test_env$driver == "OpalDriver") {
76-
expect_error(datashield.assign(conns=NULL, symbol="new_obj", value=calltext), "no applicable method for `@` applied to an object of class \"NULL\"", fixed=TRUE)
74+
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)
7775
} else {
7876
fail(message = "Unknown driver type", info = ds.test_env$driver)
7977
}

0 commit comments

Comments
 (0)