Merge pull request #255 from StuartWheater/v6.1-dev

StuartWheater · web-flow · commit 9d9899f825e5 · 2020-09-05T07:08:37.000+01:00
General tidy-up
diff --git a/README.md b/README.md
@@ -6,12 +6,12 @@ DataSHIELD client side base R library.
 
 
 
-| Branch   | dsBase status | dsBaseClient status | dsBaseClient tests |
-| -------- | ------------  | ------------------- | ------------------ |
-| Master   | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=master)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=master) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=master)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=master) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/master/latest/) |
-| v6.0-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.0-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0-dev) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.0-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.0-dev/latest/) |
-| v6.0.1-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.0.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0.1-dev) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.0.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0.1-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.0.1-dev/latest/) |
-| v6.1-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.1-dev) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.1-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.1-dev/latest/) |
+| Branch   | dsBase status | dsBase tests | dsBaseClient status | dsBaseClient tests |
+| -------- | ------------- | ------------ | ------------------- | ------------------ |
+| Master   | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=master)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=master) | | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=master)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=master) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/master/latest/) |
+| v6.0-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.0-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0-dev) | | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.0-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.0-dev/latest/) |
+| v6.0.1-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.0.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0.1-dev) | | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.0.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.0.1-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.0.1-dev/latest/) |
+| v6.1-dev | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBase?branchName=v6.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.1-dev) | [Tests](https://datashield.github.io/testStatus/dsBase/v6.1-dev/latest/) | [![Build Status](https://dev.azure.com/datashield-testing/datashield/_apis/build/status/datashield.dsBaseClient?branchName=v6.1-dev)](https://dev.azure.com/datashield-testing/datashield/_build/latest?definitionId=1&branchName=v6.1-dev) | [Tests](https://datashield.github.io/testStatus/dsBaseClient/v6.1-dev/latest/) |
 
 
 [![License](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -335,7 +335,7 @@ jobs:
                 junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml");
                 progress_rep <- ProgressReporter$new(max_failures = 999999);
                 multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
-                testthat::test_package("$(projectName)", filter = "_dgr-|datachk_dgr-|smk_dgr-|arg_dgr-|disc_dgr-|smk_expt_dgr-|expt_dgr-|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE)
+                testthat::test_package("$(projectName)", filter = "__dgr-|datachk_dgr-|smk_dgr-|arg_dgr-|disc_dgr-|smk_expt_dgr-|expt_dgr-|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE)
                 '"'"'
             )
         );
diff --git a/tests/testthat/test-smk_dgr-ds.listClientsideFunctions.R b/tests/testthat/test-smk_dgr-ds.listClientsideFunctions.R
@@ -12,7 +12,7 @@
 # Set up
 #
 
-context("ds.listClientsideFunctions:smk_dgr::setup")
+context("ds.listClientsideFunctions::smk_dgr::setup")
 
 require(dsDangerClient)
 
@@ -26,7 +26,7 @@ test_that("setup", {
 # Tests
 #
 
-context("ds.listClientsideFunctions:smk_dgr::check results")
+context("ds.listClientsideFunctions::smk_dgr::check results")
 test_that("check results", {
     output <- list(
         "ds.DANGERc2sMATDF",
@@ -52,7 +52,7 @@ test_that("check results", {
 # Shutdown
 #
 
-context("ds.listClientsideFunctions:smk_dgr::shutdown")
+context("ds.listClientsideFunctions::smk_dgr::shutdown")
 
 test_that("shutdown", {
     ds_expect_variables(c("D"))
@@ -64,4 +64,4 @@ disconnect.studies.dataset.cnsim()
 # Done
 #
 
-context("ds.listClientsideFunctions:smk_dgr::done")
+context("ds.listClientsideFunctions::smk_dgr::done")

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ jobs:`
`335`	`335`	`junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml");`
`336`	`336`	`progress_rep <- ProgressReporter$new(max_failures = 999999);`
`337`	`337`	`multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));`
`338`		`- testthat::test_package("$(projectName)", filter = "_dgr-\|datachk_dgr-\|smk_dgr-\|arg_dgr-\|disc_dgr-\|smk_expt_dgr-\|expt_dgr-\|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE)`
	`338`	`+ testthat::test_package("$(projectName)", filter = "__dgr-\|datachk_dgr-\|smk_dgr-\|arg_dgr-\|disc_dgr-\|smk_expt_dgr-\|expt_dgr-\|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE)`
`339`	`339`	`'"'"'`
`340`	`340`	`)`
`341`	`341`	`);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`# Set up`
`13`	`13`	`#`
`14`	`14`
`15`		`-context("ds.listClientsideFunctions:smk_dgr::setup")`
	`15`	`+context("ds.listClientsideFunctions::smk_dgr::setup")`
`16`	`16`
`17`	`17`	`require(dsDangerClient)`
`18`	`18`
`@@ -26,7 +26,7 @@ test_that("setup", {`
`26`	`26`	`# Tests`
`27`	`27`	`#`
`28`	`28`
`29`		`-context("ds.listClientsideFunctions:smk_dgr::check results")`
	`29`	`+context("ds.listClientsideFunctions::smk_dgr::check results")`
`30`	`30`	`test_that("check results", {`
`31`	`31`	`output <- list(`
`32`	`32`	`"ds.DANGERc2sMATDF",`
`@@ -52,7 +52,7 @@ test_that("check results", {`
`52`	`52`	`# Shutdown`
`53`	`53`	`#`
`54`	`54`
`55`		`-context("ds.listClientsideFunctions:smk_dgr::shutdown")`
	`55`	`+context("ds.listClientsideFunctions::smk_dgr::shutdown")`
`56`	`56`
`57`	`57`	`test_that("shutdown", {`
`58`	`58`	`ds_expect_variables(c("D"))`
`@@ -64,4 +64,4 @@ disconnect.studies.dataset.cnsim()`
`64`	`64`	`# Done`
`65`	`65`	`#`
`66`	`66`
`67`		`-context("ds.listClientsideFunctions:smk_dgr::done")`
	`67`	`+context("ds.listClientsideFunctions::smk_dgr::done")`