Merge pull request #57 from richfitz/cran-fixes

richfitz · Dec 4, 2023 · a080c6e · a080c6e
2 parents 0bd967c + 0066882
commit a080c6e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -36,11 +36,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
 
-      - uses: r-lib/actions/setup-pandoc@v1
+      - uses: r-lib/actions/setup-pandoc@v2
 
       - name: Start Redis
         if: runner.os != 'Windows'

diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -16,9 +16,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
 
-      - uses: r-lib/actions/setup-pandoc@v1
+      - uses: r-lib/actions/setup-pandoc@v2
 
       - name: Start Redis
         uses: shogo82148/actions-setup-redis@v1

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -20,9 +20,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
 
-      - uses: r-lib/actions/setup-pandoc@v1
+      - uses: r-lib/actions/setup-pandoc@v2
 
       - name: Start Redis
         uses: shogo82148/actions-setup-redis@v1

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: redux
 Title: R Bindings to 'hiredis'
-Version: 1.1.3
+Version: 1.1.4
 Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"),
     email = "[email protected]"))
 Description: A 'hiredis' wrapper that includes support for

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 <!-- badges: start -->
 [![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/)
 [![R build status](https://github.com/richfitz/redux/workflows/R-CMD-check/badge.svg)](https://github.com/richfitz/redux/actions)
-[![codecov.io](https://codecov.io/github/richfitz/redux/coverage.svg?branch=master)](https://codecov.io/github/richfitz/redux?branch=master)
+[![codecov.io](https://codecov.io/github/richfitz/redux/coverage.svg?branch=master)](https://app.codecov.io/github/richfitz/redux?branch=master)
 [![](https://www.r-pkg.org/badges/version/redux)](https://cran.r-project.org/package=redux)
 <!-- badges: end -->
 

diff --git a/src/conversions.c b/src/conversions.c
@@ -279,7 +279,7 @@ SEXP reply_error(redisReply* reply, bool error_throw) {
     memcpy(msg, reply->str, reply->len);
     msg[reply->len] = '\0';
     freeReplyObject(reply);
-    error(msg);
+    error("%s", msg);
     return ret;
   } else { // pass error back as object
     SEXP ret = PROTECT(mkString(reply->str));

diff --git a/tests/testthat/test-conversions.R b/tests/testthat/test-conversions.R
@@ -76,7 +76,9 @@ test_that("long integers", {
   on.exit(con$DEL(key))
 
   con$SET(key, "Hello")
-  expect_equal(con$PEXPIREAT(key, 1655555555005), 1)
+
+  t <- as.integer(con$TIME()[[1]])
+  expect_equal(con$EXPIREAT(key, t + 1000000000), 1)
 
   t0 <- con$TTL(key)
   t1 <- con$PTTL(key)

diff --git a/tests/testthat/test-zzz-commands-generic.R b/tests/testthat/test-zzz-commands-generic.R
@@ -96,6 +96,7 @@ test_that("MOVE", {
 
 test_that("OBJECT", {
   skip_if_cmd_unsupported("OBJECT")
+  testthat::skip_on_os("windows") # need to find out what this produces here
   con <- test_hiredis_connection()
   key <- rand_str()
   on.exit(con$DEL(key))
@@ -138,7 +139,8 @@ test_that("PEXPIREAT", {
   on.exit(con$DEL(key))
 
   con$SET(key, "Hello")
-  expect_equal(con$PEXPIREAT(key, 1655555555005), 1)
+  t <- as.numeric(con$TIME()[[1]]) * 1000
+  expect_equal(con$PEXPIREAT(key, t + 1000000000), 1)
   expect_gt(con$TTL(key), 0)
   expect_gt(con$PTTL(key), 0)
 })