Skip to content

Commit 83208d8

Browse files
committed
try skipping visual tests on r-devel
1 parent 1aecee5 commit 83208d8

18 files changed

+88
-0
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
env:
3232
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3333
R_KEEP_PKG_SOURCE: yes
34+
R_VERSION_TYPE: ${{ matrix.config.r }}
3435

3536
steps:
3637
- uses: actions/checkout@v3

tests/testthat/helper.R

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# used to skip visual tests of SVGs on r-devel and r-oldrel
2+
# because they can be slightly different than r-release occasionally
3+
skip_if_not_r_release <- function() {
4+
testthat::skip_if(isTRUE(Sys.getenv("R_VERSION_TYPE") == "devel"))
5+
6+
#testthat::skip_if_not(isTRUE(Sys.getenv("R_VERSION_TYPE") == "release"))
7+
}

tests/testthat/test-aesthetics.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ color_scheme_set()
219219
test_that("color_scheme_view renders correctly", {
220220
testthat::skip_on_cran()
221221
testthat::skip_if_not_installed("vdiffr")
222+
skip_if_not_r_release()
222223

223224
color_scheme_set()
224225
p_default <- color_scheme_view()

tests/testthat/test-mcmc-diagnostics.R

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ test_that("mcmc_acf & mcmc_acf_bar throw correct errors", {
109109
test_that("mcmc_rhat renders correctly", {
110110
testthat::skip_on_cran()
111111
testthat::skip_if_not_installed("vdiffr")
112+
skip_if_not_r_release()
112113

113114
rhats <- seq(from = 1, to = 1.20, length.out = 10)
114115

@@ -122,6 +123,7 @@ test_that("mcmc_rhat renders correctly", {
122123
test_that("mcmc_rhat_hist renders correctly", {
123124
testthat::skip_on_cran()
124125
testthat::skip_if_not_installed("vdiffr")
126+
skip_if_not_r_release()
125127

126128
rhats <- seq(from = 1, to = 1.20, length.out = 10)
127129

@@ -136,6 +138,7 @@ test_that("mcmc_rhat_hist renders correctly", {
136138
test_that("mcmc_neff renders correctly", {
137139
testthat::skip_on_cran()
138140
testthat::skip_if_not_installed("vdiffr")
141+
skip_if_not_r_release()
139142

140143
neffs <- seq(from = 0, to = 1, length.out = 20)
141144

@@ -146,6 +149,7 @@ test_that("mcmc_neff renders correctly", {
146149
test_that("mcmc_neff_hist renders correctly", {
147150
testthat::skip_on_cran()
148151
testthat::skip_if_not_installed("vdiffr")
152+
skip_if_not_r_release()
149153

150154
neffs <- seq(from = 0, to = 1, length.out = 20)
151155

@@ -159,6 +163,7 @@ test_that("mcmc_neff_hist renders correctly", {
159163
test_that("mcmc_acf renders correctly", {
160164
testthat::skip_on_cran()
161165
testthat::skip_if_not_installed("vdiffr")
166+
skip_if_not_r_release()
162167

163168
p_base <- mcmc_acf(vdiff_dframe)
164169
vdiffr::expect_doppelganger("mcmc_acf (default)", p_base)
@@ -170,6 +175,7 @@ test_that("mcmc_acf renders correctly", {
170175
test_that("mcmc_acf_bar renders correctly", {
171176
testthat::skip_on_cran()
172177
testthat::skip_if_not_installed("vdiffr")
178+
skip_if_not_r_release()
173179

174180
p_base <- mcmc_acf_bar(vdiff_dframe)
175181
vdiffr::expect_doppelganger("mcmc_acf_bar (default)", p_base)

tests/testthat/test-mcmc-distributions.R

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ test_that("mcmc_* throws error if 1 chain but multiple chains required", {
124124
test_that("mcmc_hist renders correctly", {
125125
testthat::skip_on_cran()
126126
testthat::skip_if_not_installed("vdiffr")
127+
skip_if_not_r_release()
127128

128129
p_base <- mcmc_hist(vdiff_dframe, binwidth = 0.1)
129130
vdiffr::expect_doppelganger("mcmc_hist (default)", p_base)
@@ -138,6 +139,7 @@ test_that("mcmc_hist renders correctly", {
138139
test_that("mcmc_dens renders correctly", {
139140
testthat::skip_on_cran()
140141
testthat::skip_if_not_installed("vdiffr")
142+
skip_if_not_r_release()
141143

142144
p_base <- mcmc_dens(vdiff_dframe)
143145
vdiffr::expect_doppelganger("mcmc_dens (default)", p_base)
@@ -149,6 +151,7 @@ test_that("mcmc_dens renders correctly", {
149151
test_that("mcmc_dens_overlay renders correctly", {
150152
testthat::skip_on_cran()
151153
testthat::skip_if_not_installed("vdiffr")
154+
skip_if_not_r_release()
152155

153156
p_base <- mcmc_dens_overlay(vdiff_dframe_chains)
154157
vdiffr::expect_doppelganger("mcmc_dens_overlay (default)", p_base)
@@ -157,6 +160,7 @@ test_that("mcmc_dens_overlay renders correctly", {
157160
test_that("mcmc_dens_chains renders correctly", {
158161
testthat::skip_on_cran()
159162
testthat::skip_if_not_installed("vdiffr")
163+
skip_if_not_r_release()
160164

161165
p_base <- mcmc_dens_chains(vdiff_dframe_chains)
162166
vdiffr::expect_doppelganger("mcmc_dens_chains (default)", p_base)
@@ -165,6 +169,7 @@ test_that("mcmc_dens_chains renders correctly", {
165169
test_that("mcmc_hist_by_chain renders correctly", {
166170
testthat::skip_on_cran()
167171
testthat::skip_if_not_installed("vdiffr")
172+
skip_if_not_r_release()
168173

169174
p_base <- mcmc_hist_by_chain(vdiff_dframe_chains, binwidth = 0.5)
170175
vdiffr::expect_doppelganger("mcmc_hist_by_chain (default)", p_base)
@@ -173,6 +178,7 @@ test_that("mcmc_hist_by_chain renders correctly", {
173178
test_that("mcmc_violin renders correctly", {
174179
testthat::skip_on_cran()
175180
testthat::skip_if_not_installed("vdiffr")
181+
skip_if_not_r_release()
176182

177183
p_base <- mcmc_violin(vdiff_dframe_chains)
178184
vdiffr::expect_doppelganger("mcmc_violin (default)", p_base)

tests/testthat/test-mcmc-intervals.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ test_that("inconsistent probabilities raise warning (#138)", {
178178
test_that("mcmc_intervals renders correctly", {
179179
testthat::skip_on_cran()
180180
testthat::skip_if_not_installed("vdiffr")
181+
skip_if_not_r_release()
181182

182183
p_base <- mcmc_intervals(vdiff_dframe)
183184
vdiffr::expect_doppelganger("mcmc_intervals (default)", p_base)
@@ -205,6 +206,7 @@ test_that("mcmc_intervals renders correctly", {
205206
test_that("mcmc_areas renders correctly", {
206207
testthat::skip_on_cran()
207208
testthat::skip_if_not_installed("vdiffr")
209+
skip_if_not_r_release()
208210

209211
p_base <- mcmc_areas(vdiff_dframe)
210212
vdiffr::expect_doppelganger("mcmc_areas (default)", p_base)
@@ -238,6 +240,7 @@ test_that("mcmc_areas renders correctly", {
238240
test_that("mcmc_areas_ridges renders correctly", {
239241
testthat::skip_on_cran()
240242
testthat::skip_if_not_installed("vdiffr")
243+
skip_if_not_r_release()
241244

242245
p_base <- mcmc_areas_ridges(vdiff_dframe)
243246
vdiffr::expect_doppelganger("mcmc_areas_ridges (default)", p_base)

tests/testthat/test-mcmc-nuts.R

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ source(test_path("data-for-mcmc-tests.R"))
9797
test_that("mcmc_nuts_acceptance renders correctly", {
9898
skip_on_cran()
9999
skip_if_not_installed("vdiffr")
100+
skip_if_not_r_release()
100101

101102
p_base <- mcmc_nuts_acceptance(vdiff_dframe_chains_np, vdiff_dframe_chains_lp)
102103
vdiffr::expect_doppelganger("mcmc_nuts_acceptance (default)", p_base)
@@ -108,6 +109,7 @@ test_that("mcmc_nuts_acceptance renders correctly", {
108109
test_that("mcmc_nuts_divergence renders correctly", {
109110
skip_on_cran()
110111
skip_if_not_installed("vdiffr")
112+
skip_if_not_r_release()
111113

112114
p_base <- mcmc_nuts_divergence(vdiff_dframe_chains_np, vdiff_dframe_chains_lp)
113115
vdiffr::expect_doppelganger("mcmc_nuts_divergence (default)", p_base)
@@ -119,6 +121,7 @@ test_that("mcmc_nuts_divergence renders correctly", {
119121
test_that("mcmc_nuts_treedepth renders correctly", {
120122
skip_on_cran()
121123
skip_if_not_installed("vdiffr")
124+
skip_if_not_r_release()
122125

123126
p_base <- mcmc_nuts_treedepth(vdiff_dframe_chains_np, vdiff_dframe_chains_lp)
124127
vdiffr::expect_doppelganger("mcmc_nuts_treedepth (default)", p_base)
@@ -130,6 +133,7 @@ test_that("mcmc_nuts_treedepth renders correctly", {
130133
test_that("mcmc_nuts_stepsize renders correctly", {
131134
skip_on_cran()
132135
skip_if_not_installed("vdiffr")
136+
skip_if_not_r_release()
133137

134138
p_base <- mcmc_nuts_stepsize(vdiff_dframe_chains_np, vdiff_dframe_chains_lp)
135139
vdiffr::expect_doppelganger("mcmc_nuts_stepsize (default)", p_base)
@@ -141,6 +145,7 @@ test_that("mcmc_nuts_stepsize renders correctly", {
141145
test_that("mcmc_nuts_energy renders correctly", {
142146
skip_on_cran()
143147
skip_if_not_installed("vdiffr")
148+
skip_if_not_r_release()
144149

145150
p_base <- mcmc_nuts_energy(vdiff_dframe_chains_np, vdiff_dframe_chains_lp, binwidth = 10)
146151
vdiffr::expect_doppelganger("mcmc_nuts_energy (default)", p_base)

tests/testthat/test-mcmc-recover.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ test_that("mcmc_recover_hist returns a ggplot object", {
106106
test_that("mcmc_recover_hist renders correctly", {
107107
skip_on_cran()
108108
skip_if_not_installed("vdiffr")
109+
skip_if_not_r_release()
109110

110111
p_base <- mcmc_recover_hist(draws, true, binwidth = 0.01)
111112
vdiffr::expect_doppelganger("mcmc_recover_hist (default)", p_base)
@@ -114,6 +115,7 @@ test_that("mcmc_recover_hist renders correctly", {
114115
test_that("mcmc_recover_intervals renders correctly", {
115116
skip_on_cran()
116117
skip_if_not_installed("vdiffr")
118+
skip_if_not_r_release()
117119

118120
p_base <- mcmc_recover_intervals(draws, true)
119121
vdiffr::expect_doppelganger("mcmc_recover_intervals (default)", p_base)
@@ -125,6 +127,7 @@ test_that("mcmc_recover_intervals renders correctly", {
125127
test_that("mcmc_recover_scatter renders correctly", {
126128
skip_on_cran()
127129
skip_if_not_installed("vdiffr")
130+
skip_if_not_r_release()
128131

129132
p_base <- mcmc_recover_scatter(draws, true)
130133
vdiffr::expect_doppelganger("mcmc_recover_scatter (default)", p_base)

tests/testthat/test-mcmc-scatter-and-parcoord.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ test_that("parcoord_style_np throws correct errors", {
373373
test_that("mcmc_scatter renders correctly", {
374374
skip_on_cran()
375375
skip_if_not_installed("vdiffr")
376+
skip_if_not_r_release()
376377

377378
p_base <- mcmc_scatter(vdiff_dframe_chains)
378379
vdiffr::expect_doppelganger("mcmc_scatter (default)", p_base)
@@ -395,6 +396,7 @@ test_that("mcmc_hex renders correctly", {
395396
skip_on_cran()
396397
skip_if_not_installed("vdiffr")
397398
skip_if_not_installed("hexbin")
399+
skip_if_not_r_release()
398400

399401
p_base <- mcmc_hex(vdiff_dframe, pars = c("V1", "V2"))
400402
vdiffr::expect_doppelganger("mcmc_hex (default)", p_base)
@@ -410,6 +412,7 @@ test_that("mcmc_hex renders correctly", {
410412
test_that("mcmc_parcoord renders correctly", {
411413
skip_on_cran()
412414
skip_if_not_installed("vdiffr")
415+
skip_if_not_r_release()
413416

414417
p_base <- mcmc_parcoord(vdiff_dframe_chains)
415418
vdiffr::expect_doppelganger("mcmc_parcoord (default)", p_base)
@@ -427,6 +430,7 @@ test_that("mcmc_pairs renders correctly", {
427430
skip_on_cran()
428431
skip_if_not_installed("vdiffr")
429432
skip_if_not_installed("hexbin")
433+
skip_if_not_r_release()
430434

431435
p_base <- mcmc_pairs(vdiff_dframe_chains)
432436
vdiffr::expect_doppelganger("mcmc_pairs (default)", p_base)

tests/testthat/test-mcmc-traces.R

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ test_that("mcmc_trace 'np' argument works", {
116116
test_that("mcmc_trace renders correctly", {
117117
testthat::skip_on_cran()
118118
testthat::skip_if_not_installed("vdiffr")
119+
skip_if_not_r_release()
119120

120121
p_base <- mcmc_trace(vdiff_dframe_chains, pars = c("V1", "V2"))
121122
p_one_param <- mcmc_trace(vdiff_dframe_chains, pars = "V1")
@@ -138,6 +139,7 @@ test_that("mcmc_trace renders correctly", {
138139
test_that("mcmc_rank_overlay renders correctly", {
139140
testthat::skip_on_cran()
140141
testthat::skip_if_not_installed("vdiffr")
142+
skip_if_not_r_release()
141143

142144
p_base <- mcmc_rank_overlay(vdiff_dframe_chains, pars = c("V1", "V2"))
143145
p_base_ref <- mcmc_rank_overlay(
@@ -167,6 +169,7 @@ test_that("mcmc_rank_overlay renders correctly", {
167169
test_that("mcmc_rank_hist renders correctly", {
168170
testthat::skip_on_cran()
169171
testthat::skip_if_not_installed("vdiffr")
172+
skip_if_not_r_release()
170173

171174
p_base <- mcmc_rank_hist(vdiff_dframe_chains, pars = c("V1", "V2"))
172175
p_base_ref <- mcmc_rank_hist(
@@ -199,6 +202,7 @@ test_that("mcmc_rank_hist renders correctly", {
199202
test_that("mcmc_trace_highlight renders correctly", {
200203
testthat::skip_on_cran()
201204
testthat::skip_if_not_installed("vdiffr")
205+
skip_if_not_r_release()
202206

203207
p_base <- mcmc_trace_highlight(
204208
vdiff_dframe_chains,
@@ -227,6 +231,7 @@ test_that("mcmc_trace_highlight renders correctly", {
227231
test_that("mcmc_rank_ecdf renders correctly", {
228232
testthat::skip_on_cran()
229233
testthat::skip_if_not_installed("vdiffr")
234+
skip_if_not_r_release()
230235

231236
p_base <- mcmc_rank_ecdf(vdiff_dframe_chains, pars = c("V1", "V2"))
232237
p_one_param <- mcmc_rank_ecdf(vdiff_dframe_chains, pars = "V1")
@@ -255,6 +260,7 @@ test_that("mcmc_rank_ecdf renders correctly", {
255260
test_that("mcmc_trace with 'np' renders correctly", {
256261
testthat::skip_on_cran()
257262
testthat::skip_if_not_installed("vdiffr")
263+
skip_if_not_r_release()
258264

259265
p_base <- mcmc_trace(
260266
vdiff_dframe_chains,

0 commit comments

Comments
 (0)