From 9066d079d0e2a5cd3b0e34c55a6bc6b77187ad9d Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 25 Jan 2022 19:38:47 +0530 Subject: [PATCH] Use testthat, rather than tinytest tinytest doesn't exist in older MRAN snapshots --- tests/conda/r3.6/environment.yml | 2 +- tests/conda/r3.6/verify | 2 +- tests/r/mran/install.R | 2 +- tests/r/mran/verify | 2 +- tests/r/r3.6/install.R | 2 +- tests/r/r3.6/verify | 2 +- tests/r/r4.0-rspm/install.R | 2 +- tests/r/r4.0-rspm/verify | 2 +- tests/r/r4.0/install.R | 2 +- tests/r/r4.0/verify | 2 +- tests/r/r4.1/install.R | 2 +- tests/r/r4.1/verify | 2 +- tests/r/simple/install.R | 2 +- tests/r/simple/verify | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/conda/r3.6/environment.yml b/tests/conda/r3.6/environment.yml index 0f6fb07d..c1d2a2be 100644 --- a/tests/conda/r3.6/environment.yml +++ b/tests/conda/r3.6/environment.yml @@ -1,3 +1,3 @@ dependencies: - r-base=3.6 - - r-tinytest + - r-testthat diff --git a/tests/conda/r3.6/verify b/tests/conda/r3.6/verify index 46983451..63a7165f 100755 --- a/tests/conda/r3.6/verify +++ b/tests/conda/r3.6/verify @@ -2,6 +2,6 @@ jupyter serverextension list 2>&1 | grep jupyter_server_proxy jupyter nbextension list 2>&1 | grep jupyter_server_proxy -R -e "library('tinytest')" +R -e "library('testthat')" # Fail if version is not 3.6 R -e 'if (!(version$major == "3" && as.double(version$minor) >= 6 && as.double(version$minor) < 7)) quit("yes", 1)' diff --git a/tests/r/mran/install.R b/tests/r/mran/install.R index f84039fe..b4fdeb90 100644 --- a/tests/r/mran/install.R +++ b/tests/r/mran/install.R @@ -1 +1 @@ -install.packages("tinytest") +install.packages("testthat") diff --git a/tests/r/mran/verify b/tests/r/mran/verify index cb97fd27..b15da154 100755 --- a/tests/r/mran/verify +++ b/tests/r/mran/verify @@ -1,5 +1,5 @@ #!/usr/bin/env Rscript -library('tinytest') +library('testthat') print(version) diff --git a/tests/r/r3.6/install.R b/tests/r/r3.6/install.R index f84039fe..b4fdeb90 100644 --- a/tests/r/r3.6/install.R +++ b/tests/r/r3.6/install.R @@ -1 +1 @@ -install.packages("tinytest") +install.packages("testthat") diff --git a/tests/r/r3.6/verify b/tests/r/r3.6/verify index a8754e5b..42f33de3 100755 --- a/tests/r/r3.6/verify +++ b/tests/r/r3.6/verify @@ -1,5 +1,5 @@ #!/usr/bin/env Rscript -library('tinytest') +library('testthat') print(version) # Fail if version is not 3.6 diff --git a/tests/r/r4.0-rspm/install.R b/tests/r/r4.0-rspm/install.R index f84039fe..b4fdeb90 100644 --- a/tests/r/r4.0-rspm/install.R +++ b/tests/r/r4.0-rspm/install.R @@ -1 +1 @@ -install.packages("tinytest") +install.packages("testthat") diff --git a/tests/r/r4.0-rspm/verify b/tests/r/r4.0-rspm/verify index e6af9b65..091739e2 100755 --- a/tests/r/r4.0-rspm/verify +++ b/tests/r/r4.0-rspm/verify @@ -1,5 +1,5 @@ #!/usr/bin/env Rscript -library('tinytest') +library('testthat') print(version) # Fail if version is not 4.0 diff --git a/tests/r/r4.0/install.R b/tests/r/r4.0/install.R index f84039fe..b4fdeb90 100644 --- a/tests/r/r4.0/install.R +++ b/tests/r/r4.0/install.R @@ -1 +1 @@ -install.packages("tinytest") +install.packages("testthat") diff --git a/tests/r/r4.0/verify b/tests/r/r4.0/verify index 0cc1f184..d715cb38 100755 --- a/tests/r/r4.0/verify +++ b/tests/r/r4.0/verify @@ -1,5 +1,5 @@ #!/usr/bin/env Rscript -library('tinytest') +library('testthat') print(version) # Fail if version is not 4.0 diff --git a/tests/r/r4.1/install.R b/tests/r/r4.1/install.R index f84039fe..b4fdeb90 100644 --- a/tests/r/r4.1/install.R +++ b/tests/r/r4.1/install.R @@ -1 +1 @@ -install.packages("tinytest") +install.packages("testthat") diff --git a/tests/r/r4.1/verify b/tests/r/r4.1/verify index bbe6ffc1..c390f270 100755 --- a/tests/r/r4.1/verify +++ b/tests/r/r4.1/verify @@ -1,5 +1,5 @@ #!/usr/bin/env Rscript -library('tinytest') +library('testthat') # Fail if version is not 4.1 if (!(version$major == "4" && as.double(version$minor) >= 1 && as.double(version$minor) < 2)) { diff --git a/tests/r/simple/install.R b/tests/r/simple/install.R index f84039fe..b4fdeb90 100644 --- a/tests/r/simple/install.R +++ b/tests/r/simple/install.R @@ -1 +1 @@ -install.packages("tinytest") +install.packages("testthat") diff --git a/tests/r/simple/verify b/tests/r/simple/verify index e6a8ef8c..1ccbaa97 100755 --- a/tests/r/simple/verify +++ b/tests/r/simple/verify @@ -1,5 +1,5 @@ #!/usr/bin/env Rscript -library('tinytest') +library('testthat') # Fail if version is not 4.1 if (!(version$major == "4" && as.double(version$minor) >= 1 && as.double(version$minor) < 2)) {