From 28949badd54b17ddd4ea04a33bd2f02abd218f08 Mon Sep 17 00:00:00 2001 From: egillax Date: Fri, 26 Apr 2024 19:10:57 +0200 Subject: [PATCH] fix test that failed only during codecov --- .github/workflows/R_CMD_check_Hades.yaml | 4 ++-- R/AdditionalCovariates.R | 3 ++- tests/testthat/test-UploadToDatabase.R | 6 ++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/R_CMD_check_Hades.yaml b/.github/workflows/R_CMD_check_Hades.yaml index 1f4ef4a15..9484c122d 100644 --- a/.github/workflows/R_CMD_check_Hades.yaml +++ b/.github/workflows/R_CMD_check_Hades.yaml @@ -87,13 +87,13 @@ jobs: path: check/*.tar.gz - name: Install covr - if: runner.os == 'macOS' + if: runner.os == 'Linux' run: | remotes::install_cran("covr") shell: Rscript {0} - name: Test coverage - if: runner.os == 'macOS' + if: runner.os == 'Linux' run: covr::codecov() shell: Rscript {0} diff --git a/R/AdditionalCovariates.R b/R/AdditionalCovariates.R index 77204d1de..b3714c009 100644 --- a/R/AdditionalCovariates.R +++ b/R/AdditionalCovariates.R @@ -46,7 +46,8 @@ getCohortCovariateData <- function( rowIdField = "row_id", aggregated, cohortIds, - covariateSettings + covariateSettings, + ... ){ # Some SQL to construct the covariate: diff --git a/tests/testthat/test-UploadToDatabase.R b/tests/testthat/test-UploadToDatabase.R index 0125080f4..908ab44d3 100644 --- a/tests/testthat/test-UploadToDatabase.R +++ b/tests/testthat/test-UploadToDatabase.R @@ -31,10 +31,8 @@ connectionRedshift <- DatabaseConnector::createConnectionDetails( conn <- DatabaseConnector::connect(connectionRedshift) targetDialect <- 'postgresql' -withr::with_seed(NULL, { - randVar <- rawToChar(as.raw(sample(c(65:90,97:122), 5, replace=T))) - } -) +set.seed(NULL) +randVar <- rawToChar(as.raw(sample(c(65:90,97:122), 5, replace=T))) appendRandom <- function(x, rand = randVar){ return(paste("plp", rand, x, sep=''))