Merge pull request #301 from StuartWheater/master

Updates to reflect changes to testthat

Author: StuartWheater

azure-pipelines.yml

@@ -11,6 +11,7 @@
 # /logs                       <- Where results of tests and lots are collated
 #
 # As of May 2020 this takes ~ 70 mins to run.
+# As of Nov 2020 this takes ~ 120 mins to run.
 #
 # The only things that should ever be changed are the repo branches in the resources.
 #
@@ -54,16 +55,22 @@ resources:
 #########################################################################################
 # When and under what condition to run the pipeline.
 schedules:
-  - cron: "32 1 * * *"
-    displayName: Nightly build
+  - cron: "0 0 * * 0"
+    displayName: Weekly build - master
     branches:
      include:
       - master
     always: true
+  - cron: "0 2 * * 0"
+    displayName: Nightly build - v6.2-dev
+    branches:
+     include:
+      - v6.2-dev
+    always: true
 
 jobs:
 - job: build_and_run_tests
-  timeoutInMinutes: 120
+  timeoutInMinutes: 150
   pool:
     vmImage: 'Ubuntu 16.04'
 
@@ -273,7 +280,7 @@ jobs:
       # display the test console output
       cat test_console_output_dsbase.txt
 
-      grep --quiet "Failed:   0" test_console_output_dsbase.txt
+      grep --quiet " FAIL 0 " test_console_output_dsbase.txt
 
     workingDirectory: $(Pipeline.Workspace)/dsBaseClient
     displayName: 'Code coverage and JUnit report output, with dsBase'
@@ -376,7 +383,7 @@ jobs:
       mv coveragelist.csv $(Pipeline.Workspace)/logs
       mv test_results.xml $(Pipeline.Workspace)/logs
 
-      grep --quiet "Failed:   0" test_console_output_dsdanger.txt
+      grep --quiet " FAIL 0 " test_console_output_dsdanger.txt
 
     workingDirectory: $(Pipeline.Workspace)/dsBaseClient
     displayName: 'Code coverage and JUnit report output, with dsBase and dsDanger'
@@ -423,7 +430,11 @@ jobs:
 
       cat test_console_output_bug.txt
 
-      mv test_results_bug.xml $(Pipeline.Workspace)/logs
+      if [ -e test_results_bug.xml ]; then
+          mv test_results_bug.xml $(Pipeline.Workspace)/logs
+      else
+          touch $(Pipeline.Workspace)/logs/test_results_bug.xml
+      fi
 
     workingDirectory: $(Pipeline.Workspace)/dsBaseClient
     displayName: 'Bug report output'