Skip to content

fix tests for Lockable PR #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2024
Merged

fix tests for Lockable PR #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ArgTools"
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
authors = ["Stefan Karpinski <[email protected]> and contributors"]
version = "1.1.1"
version = "1.1.2"

[compat]
julia = "1.3"
Expand Down
39 changes: 30 additions & 9 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,36 @@ import Base.Filesystem: TEMP_CLEANUP
@test_throws ErrorException send_data(ErrIO(), dst)
@test !isfile(dst)
end
@testset "arg_write(nothing)" begin
SAVE_TEMP_CLEANUP = copy(TEMP_CLEANUP)
empty!(TEMP_CLEANUP)
try
@test_throws ErrorException send_data(ErrIO())
@test length(TEMP_CLEANUP) == 1
@test !ispath(first(keys(TEMP_CLEANUP)))
finally
merge!(TEMP_CLEANUP, SAVE_TEMP_CLEANUP)
# post-https://github.com/JuliaLang/julia/pull/52898 we need to acquire
# the lock and unpack `TEMP_CLEANUP` to use it.
if isdefined(Base, :Lockable) && TEMP_CLEANUP isa Base.Lockable
@testset "arg_write(nothing)" begin
local SAVE_TEMP_CLEANUP
@lock TEMP_CLEANUP begin
SAVE_TEMP_CLEANUP = copy(TEMP_CLEANUP[])
empty!(TEMP_CLEANUP[])
end
try
@test_throws ErrorException send_data(ErrIO())
@lock TEMP_CLEANUP begin
@test length(TEMP_CLEANUP[]) == 1
@test !ispath(first(keys(TEMP_CLEANUP[])))
end
finally
@lock TEMP_CLEANUP merge!(TEMP_CLEANUP[], SAVE_TEMP_CLEANUP)
end
end
else
@testset "arg_write(nothing)" begin
SAVE_TEMP_CLEANUP = copy(TEMP_CLEANUP)
empty!(TEMP_CLEANUP)
try
@test_throws ErrorException send_data(ErrIO())
@test length(TEMP_CLEANUP) == 1
@test !ispath(first(keys(TEMP_CLEANUP)))
finally
merge!(TEMP_CLEANUP, SAVE_TEMP_CLEANUP)
end
end
end
end
Expand Down