Skip to content

Commit c45a84c

Browse files
Merge pull request datashield#524 from StuartWheater/v6.3.1-dev
Increase timeout to 6 hours! and rework ds.metadata for Armadillo
2 parents a120bf8 + 47c6e2f commit c45a84c

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

azure-pipelines.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#
1313
# As of May 2020 this takes ~ 70 mins to run.
1414
# As of Nov 2020 this takes ~ 120 mins to run.
15+
# As of Mar 2024 this takes ~ 300+ mins to run!
1516
#
1617
# The only things that should ever be changed are the repo branches in the resources.
1718
#
@@ -66,7 +67,7 @@ schedules:
6667

6768
jobs:
6869
- job: build_and_run_tests
69-
timeoutInMinutes: 300
70+
timeoutInMinutes: 360
7071
pool:
7172
vmImage: ubuntu-20.04
7273

tests/testthat/test-smk-ds.metadata.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ test_that("data.frame metadata", {
3535
expect_true(all(class(res$sim1) %in% c('list')))
3636
expect_true(all(names(res$sim1) %in% c('names', 'spec', 'class')))
3737
expect_length(res$sim1$names, 11)
38-
expect_length(res$sim1$class, 3)
38+
expect_length(res$sim1$class, 1)
3939
expect_length(res$sim2, 2)
4040
expect_true(all(class(res$sim2) %in% c('list')))
4141
expect_true(all(names(res$sim2) %in% c('names', 'spec', 'class')))
4242
expect_length(res$sim2$names, 11)
43-
expect_length(res$sim2$class, 3)
43+
expect_length(res$sim2$class, 1)
4444
expect_length(res$sim3, 2)
4545
expect_true(all(class(res$sim3) %in% c('list')))
4646
expect_true(all(names(res$sim3) %in% c('names', 'spec', 'class')))
4747
expect_length(res$sim3$names, 11)
48-
expect_length(res$sim3$class, 3)
48+
expect_length(res$sim3$class, 1)
4949
} else if (ds.test_env$driver == "OpalDriver") {
5050
expect_true(all(class(res) %in% c('list')))
5151
expect_length(res, 3)
@@ -73,9 +73,9 @@ test_that("column metadata", {
7373
if (ds.test_env$driver == "ArmadilloDriver") {
7474
expect_true(all(class(res) %in% c('list')))
7575
expect_length(res, 3)
76-
expect_length(res$sim1, 0)
77-
expect_length(res$sim2, 0)
78-
expect_length(res$sim3, 0)
76+
expect_length(res$sim1, 7)
77+
expect_length(res$sim2, 7)
78+
expect_length(res$sim3, 7)
7979
} else if (ds.test_env$driver == "OpalDriver") {
8080
expect_length(res$sim1, 6)
8181
expect_true(all(class(res$sim1) %in% c('list')))

0 commit comments

Comments
 (0)