Merge branch 'HighlanderLab:devel' into devel

HighlanderLab · Dec 20, 2023 · 329e15e · 329e15e
2 parents c59bd6f + e73e112
commit 329e15e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -2,9 +2,9 @@
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [main, master]
+    branches: [devel, master]
   pull_request:
-    branches: [main, master]
+    branches: [devel, master]
 
 name: R-CMD-check
 

diff --git a/tests/testthat/test-L1_pop_functions.R b/tests/testthat/test-L1_pop_functions.R
@@ -188,7 +188,7 @@ test_that("pullCastePop", {
   expect_type(pullCastePop(apiary1, caste = "queen", nInd = 1)$pulled, "list")
   expect_error(pullCastePop(apiary2, caste = "queen", nInd = 1))
   # Warning- if pulling drones, pulls drones that are not yet mated
-  expect_warning(pullCastePop(colony, caste = "drones"))
+  expect_warning(pullCastePop(colony, caste = "drones", nInd = 150))
   suppressWarnings(expect_s4_class(pullCastePop(colony, caste = "drones")$pulled, "Pop"))
   suppressWarnings(expect_s4_class(pullCastePop(colony, caste = "drones")$remnant, "Colony"))
 
@@ -279,7 +279,7 @@ test_that("cross", {
 
   # Message if fathers == 0 "Mating failed"
   expect_error(cross(virginQueen2, drones= selectInd(colony@drones,nInd = 0, use = "rand", simParam = SP), simParamBee = SP))
-  expect_message(cross(virginQueen2, drones= selectInd(colony@drones,nInd = 0, use = "rand", simParam = SP), checkCross = "warning", simParamBee = SP))
+  #expect_message(cross(virginQueen2, drones= selectInd(colony@drones,nInd = 0, use = "rand", simParam = SP), checkCross = "warning", simParamBee = SP))
 })
 
 # ---- setQueensYearOfBirth ----