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

Updated phase 2 test running, remove committed temp file

Author: StuartWheater

.Rd2pdf14688/Rd2.tex

@@ -46,8 +46,8 @@ resources:
   - repository: datashield-infrastructureRepo
     type: github
     endpoint: datashield-testing
-    name: StuartWheater/datashield-infrastructure
-    ref: v6.1-dev_dsdanger
+    name: datashield/datashield-infrastructure
+    ref: v6.1-dev
 
 
 #########################################################################################
@@ -262,7 +262,7 @@ jobs:
                 junit_rep <- JunitReporter$new(file = "test_results_dsbase.xml");
                 progress_rep <- ProgressReporter$new(max_failures = 999999);
                 multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
-                testthat::test_package("$(projectName)", filter = "_-", reporter = multi_rep, stop_on_failure = FALSE)
+                testthat::test_package("$(projectName)", filter = "_-|datachk-|smk-|arg-|disc-|smk_expt-|expt-|math-", reporter = multi_rep, stop_on_failure = FALSE)
                 '"'"'
             )
         );
@@ -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 = "smk_dgr-",reporter = multi_rep, stop_on_failure = FALSE)
+                testthat::test_package("$(projectName)", filter = "smk_dgr-|math_dgr-",reporter = multi_rep, stop_on_failure = FALSE)
                 '"'"'
             )
         );

.Rd2pdf7124/Rd2.tex

@@ -1,7 +1,7 @@
 source("connection_to_datasets/init_testing_datasets.R")
 source("definition_tests/def-ds.skewness.R")
 
-context("ds.skewness()::math::mean.median.mode::multiple")
+context("ds.skewness()::math_dgr::mean.median.mode::multiple")
 test_that("skewness >0 & mode<median<mean or skewness<0 & mean<median<mode",
 {
  connect.all.datasets()
@@ -17,7 +17,7 @@ test_that("skewness >0 & mode<median<mean or skewness<0 & mean<median<mode",
 
 })
 
-context("ds.skewness()::math::Q1.Q2.Q3::multiple")
+context("ds.skewness()::math_dgr::Q1.Q2.Q3::multiple")
 test_that("skewness >0 & Q3-Q2>Q2-Q1 or skewness<0 & Q3-Q2<Q2-Q1",
 {
   connect.all.datasets()

azure-pipelines.yml

@@ -23,7 +23,7 @@ test_that("setup", {
 # Tests
 #
 
-context("ds.table::smk dataframe setup")
+context("ds.table::smk::dataframe setup")
 test_that("simple table 2D", {
   ds.asFactor(input.var.name="D$FACTOR_CHARACTER", newobj.name="factorCharacter")
   ds.asFactor(input.var.name="D$FACTOR_INTEGER", newobj.name="factorInteger")