test: enable parallel execution and streamline CI workflows

.github/workflows/coverage.yml

@@ -10,6 +10,10 @@ name: Coverage
 
 permissions: read-all
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   test-coverage:
     if: contains(github.event.head_commit.message, '[ci skip]') == false

.github/workflows/lint.yml

@@ -8,6 +8,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     if: contains(github.event.head_commit.message, '[ci skip]') == false

.github/workflows/rcmdcheck.yml

@@ -8,15 +8,11 @@ on:
     branches:
       - master
 
-jobs:
-  cleanup:
-    name: Cancel Previous Runs
-    runs-on: ubuntu-latest
-    steps:
-      - uses: styfle/cancel-workflow-action@0.13.0
-        with:
-          access_token: ${{ github.token }}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
+jobs:
   rcmdcheck:
     if: contains(github.event.head_commit.message, '[ci skip]') == false
     name: rcmdcheck ${{ matrix.os }}

DESCRIPTION

@@ -52,4 +52,5 @@ NeedsCompilation: yes
 Roxygen: list(markdown = TRUE, r6 = FALSE)
 RoxygenNote: 7.3.3
 Config/testthat/edition: 3
+Config/testthat/parallel: true
 Config/Needs/development: testthat, magrittr, mockery, purrr, withr, rmarkdown

R/languageclient.R

@@ -6,8 +6,12 @@ LanguageClient <- R6::R6Class("LanguageClient",
         read_char_buf = raw(0),
 
         finalize = function() {
-            if (!is.null(self$process)) {
-                self$process$kill_tree()
+            if (!is.null(self$process) && self$process$is_alive()) {
+                if (identical(Sys.getenv("R_COVR"), "true")) {
+                    self$process$wait()
+                } else {
+                    self$process$kill_tree()
+                }
             }
             super$finalize()
         }

R/task.R

@@ -148,7 +148,11 @@ TaskManager <- R6::R6Class("TaskManager",
                     if (is.null(idle_start)) {
                         attr(session, "idle_start") <- Sys.time()
                     } else if (as.numeric(difftime(Sys.time(), idle_start, units = "secs")) > private$session_idle_timeout) {
-                        session$close()
+                         if (identical(Sys.getenv("R_COVR"), "true")) {
+                            session$close(grace = 10000)
+                         } else {
+                            session$close()
+                         }
                         private$sessions[[i]] <- NULL
                     }
                 } else {
@@ -241,7 +245,13 @@ TaskManager <- R6::R6Class("TaskManager",
             }
             if (private$use_session) {
                 for (session in private$sessions) {
-                    if (!identical(Sys.getenv("R_COVR"), "true")) {
+                    if (identical(Sys.getenv("R_COVR"), "true")) {
+                        while (session$get_state() %in% c("starting", "busy")) {
+                            session$poll_process(1000)
+                            tryCatch(session$read(), error = function(e) NULL)
+                        }
+                        session$close(grace = 10000)
+                    } else {
                         session$close()
                     }
                 }

R/workspace.R

@@ -34,7 +34,8 @@ Workspace <- R6::R6Class("Workspace",
             self$namespaces <- collections::dict()
             self$startup_packages <- tryCatch(
                 callr::r(resolve_attached_packages,
-                    system_profile = TRUE, user_profile = TRUE, timeout = 3),
+                    system_profile = TRUE, user_profile = TRUE,
+                    timeout = if (identical(Sys.getenv("R_COVR"), "true")) 30 else 3),
                 error = function(e) {
                     logger$info("workspace initialize error: ", e)
                     startup_packages

tests/testthat/test-completion.R

@@ -592,7 +592,7 @@ test_that("Completion inside a package works", {
     client %>% did_open(temp_file)
     result <- client %>% respond_completion(
         temp_file, c(0, 4),
-        retry_when = function(result) length(result) == 0 || length(result$items) == 0)
+        retry_when = function(result) length(result) == 0 || length(result$items) == 0 || length(result$items %>% keep(~.$label == "nothing")) == 0)
 
     expect_length(result$items %>% keep(~.$label == "nothing"), 1)
 })
@@ -609,7 +609,7 @@ test_that("Completion of imported objects works inside a package", {
     client %>% did_open(temp_file)
     result <- client %>% respond_completion(
         temp_file, c(0, 3),
-        retry_when = function(result) length(result) == 0 || length(result$items) == 0)
+        retry_when = function(result) length(result) == 0 || length(result$items) == 0 || length(result$items %>% keep(~.$label == "dict")) == 0)
 
     expect_length(result$items %>% keep(~.$label == "dict"), 1)
 
@@ -620,7 +620,7 @@ test_that("Completion of imported objects works inside a package", {
     client %>% did_open(temp_file)
     result <- client %>% respond_completion(
         temp_file, c(0, 6),
-        retry_when = function(result) length(result) == 0 || length(result$items) == 0)
+        retry_when = function(result) length(result) == 0 || length(result$items) == 0 || length(result$items %>% keep(~.$label == "lint_package")) == 0)
 
     expect_length(result$items %>% keep(~.$label == "lint_package"), 1)
 })