Skip to content

Commit f084ec9

Browse files
committed
Fix curl fd poll tests
Apparently, this only works correctly with HTTP/1.1, and fails with HTTP/2.
1 parent fb3b4d8 commit f084ec9

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

tests/testthat/test-poll-curl.R

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11

22
test_that("curl fds", {
33
skip_on_cran()
4-
if (Sys.getenv("CI") != "" && Sys.info()[["sysname"]] == "Darwin") {
5-
skip("fragile on GHA macOS")
6-
}
74

85
resp <- list()
96
errm <- character()
@@ -13,15 +10,15 @@ test_that("curl fds", {
1310
pool <- curl::new_pool()
1411
url1 <- httpbin$url("/status/200")
1512
url2 <- httpbin$url("/delay/1")
16-
curl::multi_add(pool = pool, curl::new_handle(url = url1),
13+
curl::multi_add(pool = pool, curl::new_handle(url = url1, http_version = 2),
1714
done = done, fail = fail)
18-
curl::multi_add(pool = pool, curl::new_handle(url = url1),
15+
curl::multi_add(pool = pool, curl::new_handle(url = url1, http_version = 2),
1916
done = done, fail = fail)
20-
curl::multi_add(pool = pool, curl::new_handle(url = url2),
17+
curl::multi_add(pool = pool, curl::new_handle(url = url2, http_version = 2),
2118
done = done, fail = fail)
22-
curl::multi_add(pool = pool, curl::new_handle(url = url1),
19+
curl::multi_add(pool = pool, curl::new_handle(url = url1, http_version = 2),
2320
done = done, fail = fail)
24-
curl::multi_add(pool = pool, curl::new_handle(url = url1),
21+
curl::multi_add(pool = pool, curl::new_handle(url = url1, http_version = 2),
2522
done = done, fail = fail)
2623

2724
timeout <- Sys.time() + 5
@@ -56,7 +53,7 @@ test_that("curl fds before others", {
5653

5754
pool <- curl::new_pool()
5855
url <- httpbin$url("/delay/1")
59-
curl::multi_add(pool = pool, curl::new_handle(url = url))
56+
curl::multi_add(pool = pool, curl::new_handle(url = url, http_version = 2))
6057

6158
timeout <- Sys.time() + 5
6259
repeat {
@@ -87,7 +84,7 @@ test_that("process fd before curl fd", {
8784

8885
pool <- curl::new_pool()
8986
url <- httpbin$url("/delay/1")
90-
curl::multi_add(pool = pool, curl::new_handle(url = url))
87+
curl::multi_add(pool = pool, curl::new_handle(url = url, http_version = 2))
9188

9289
timeout <- Sys.time() + 5
9390
repeat {

0 commit comments

Comments
 (0)