Merge remote-tracking branch 'upstream/v6.0.1-dev' into v6.0.1-dev

StuartWheater · StuartWheater · commit 4253c4e31fd7 · 2020-06-30T10:54:10.000+01:00
diff --git a/azure-pipelines_site.pp b/azure-pipelines_site.pp
@@ -16,7 +16,7 @@
   remote_mysql   => false,        # There is not a remote mysql server
 
   dsbase_githubusername      => 'datashield',
-  dsbase_ref                 => 'master',
+  dsbase_ref                 => 'v6.0.1-dev',
   dsstats_githubusername     => 'datashield',
   dsstats_ref                => '',
   dsgraphics_githubusername  => 'datashield',
diff --git a/tests/testthat/test-smk-ds.dataFrameFill-donothing.R b/tests/testthat/test-smk-ds.dataFrameFill-donothing.R
@@ -42,7 +42,7 @@ test_that("dataFrameFill_donothing", {
     expect_equal(colnamesD$sim3[2], "LAB_TRIG")
     expect_equal(colnamesD$sim3[3], "LAB_HDL")
 
-    expect_error(ds.dataFrameFill(df.name="D", newobj="filled_df"), "The dataframes have the same variables!")
+    expect_error(ds.dataFrameFill(df.name="D", newobj="filled_df"), "The dataframes have the same variables. There are no missing variables to fill!")
 })
 
 #

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ test_that("dataFrameFill_donothing", {`
`42`	`42`	`expect_equal(colnamesD$sim3[2], "LAB_TRIG")`
`43`	`43`	`expect_equal(colnamesD$sim3[3], "LAB_HDL")`
`44`	`44`
`45`		`- expect_error(ds.dataFrameFill(df.name="D", newobj="filled_df"), "The dataframes have the same variables!")`
	`45`	`+ expect_error(ds.dataFrameFill(df.name="D", newobj="filled_df"), "The dataframes have the same variables. There are no missing variables to fill!")`
`46`	`46`	`})`
`47`	`47`
`48`	`48`	`#`