Merge pull request #14 from c42f/cjf/fix-redirect-stdio

Fix stdio redirections for the Julia 1.7 API  breakage

Author: c42f

.github/workflows/CI.yml

@@ -1,7 +1,10 @@
 name: CI
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+    tags: '*'
+  pull_request:
 jobs:
   test:
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -10,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.5'
+          - '1.6'
           - '1'
           - 'nightly'
         os:

Project.toml

@@ -1,7 +1,7 @@
 name = "ResourceContexts"
 uuid = "8d208092-d35c-4dd3-a0d7-8325f9cce6b4"
 authors = ["Chris Foster <chris42f@gmail.com> and contributors"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -11,6 +11,7 @@ julia = "1.5"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 
 [targets]
-test = ["Test"]
+test = ["Test", "Compat"]

src/base_interop.jl

@@ -45,6 +45,10 @@ end
 
 # Standard streams
 
+# Incompatibility due to
+# https://github.com/JuliaLang/julia/pull/39132
+@static if VERSION < v"1.7"
+
 @! function Base.redirect_stdout(stream)
     prev_stream = stdout
     x = redirect_stdout(stream)
@@ -66,3 +70,21 @@ end
     x
 end
 
+else
+
+@! function (f::Base.RedirectStdStream)(stream)
+    # See https://github.com/JuliaLang/julia/blob/294b0dfcd308b3c3f829b2040ca1e3275595e058/base/stream.jl#L1417
+    stdold = f.unix_fd == 0 ? stdin :
+             f.unix_fd == 1 ? stdout :
+             f.unix_fd == 2 ? stderr :
+             throw(ArgumentError("Not implemented to get old handle of fd except for stdio"))
+    x = f(stream)
+    @defer f(stdold)
+    x
+end
+
+@! function Base.redirect_stdio(; kws...)
+    @! enter_do(redirect_stdio; kws...)
+end
+
+end

test/base_interop.jl

@@ -97,11 +97,7 @@
             seek(io, 0)
             stderr_result = readline(io)
         end
-        if VERSION < v"1.7-DEV"
-            @test stderr_result == "hi"
-        else
-            @test_broken stderr_result == "hi"
-        end
+        @test stderr_result == "hi"
 
         stdin_result = nothing
         @context begin
@@ -112,11 +108,7 @@
             @! redirect_stdin(io)
             stdin_result = readline()
         end
-        if VERSION < v"1.7-DEV"
-            @test stdin_result == "hi"
-        else
-            @test_broken stdin_result == "hi"
-        end
+        @test stdin_result == "hi"
 
         @test orig_stdin == stdin
         @test orig_stdout == stdout

test/runtests.jl

@@ -1,6 +1,7 @@
 using ResourceContexts
 using Test
 using Logging
+using Compat
 
 # Use of @! to pass context to resource creation function
 @! function foo(x, label)
@@ -35,7 +36,7 @@ end
             @defer error("B")
         end
     catch exc
-        stack = Base.catch_stack()
+        stack = current_exceptions()
         @test stack[1][1] == ErrorException("B")
         @test stack[2][1] == ErrorException("A")
     end
@@ -92,7 +93,7 @@ end
         end
     catch e
         @test e isa TaskFailedException
-        first(Base.catch_stack(e.task))[1]
+        first(current_exceptions(e.task))[1]
     end == ErrorException("Oops1")
 
     @test try
@@ -101,7 +102,7 @@ end
         end
     catch e
         @test e isa TaskFailedException
-        first(Base.catch_stack(e.task))[1]
+        first(current_exceptions(e.task))[1]
     end == ErrorException("Oops2")
 end