Skip to content

Commit

Permalink
Revert extra tests for DictChannel failure (#16266)
Browse files Browse the repository at this point in the history
* Revert "one more check"

This reverts commit 48e969c.

* Revert "detect cause of #16091"

This reverts commit 6359f1d.

* move remote ref finalizer test into regular CI
  • Loading branch information
amitmurthy committed May 9, 2016
1 parent c8ee106 commit b4822a4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 32 deletions.
30 changes: 3 additions & 27 deletions test/examples.jl
Original file line number Diff line number Diff line change
Expand Up @@ -47,37 +47,13 @@ end
dc_path = joinpath(dir, "dictchannel.jl")
myid() == 1 || include(dc_path)

# The checks to see if DictChannel is defined is to identify the root cause of
# https://github.com/JuliaLang/julia/issues/16091 .
# To be removed once fixed.
defined_on_worker = false
if (myid() != 1) && !isdefined(:DictChannel)
error("myid : $(myid()). DictChannel not defined.")
else
defined_on_worker = true
end

# Run the remote on pid 1, since runtests may terminate workers
# at any time depending on memory usage
@test remotecall_fetch(1, dc_path) do f
remotecall_fetch(1, dc_path) do f
include(f)
return :infungible
end === :infungible

defined_on_master = false
if remotecall_fetch(isdefined, 1, :DictChannel) == false
error("myid : $(myid()). DictChannel not defined on 1")
else
defined_on_master = true
end

dc = nothing
try
dc=RemoteChannel(()->DictChannel(), 1)
catch e
println("myid : ", myid(), ", dc_path : ", dc_path, ", defined_on_worker:", defined_on_worker, ", defined_on_master: ", defined_on_master)
rethrow(e)
nothing
end
dc=RemoteChannel(()->DictChannel(), 1)
@test typeof(dc) == RemoteChannel{DictChannel}

@test isready(dc) == false
Expand Down
11 changes: 6 additions & 5 deletions test/parallel_exec.jl
Original file line number Diff line number Diff line change
Expand Up @@ -767,11 +767,6 @@ if DoFullTest
end
sleep(0.5) # Give some time for the above error to be printed

# github PR #14456
for n = 1:10^6
fetch(@spawnat myid() myid())
end

@unix_only begin
function test_n_remove_pids(new_pids)
for p in new_pids
Expand Down Expand Up @@ -909,3 +904,9 @@ for tid in [id_other, id_me, Base.default_worker_pool()]
test_f_args(13, f_args, tid, 1; kw1=4, kw2=8)
test_f_args(15, f_args, tid, 1, 2; kw1=4, kw2=8)
end

# github PR #14456
for n = 1:10^5
fetch(@spawnat myid() myid())
end

0 comments on commit b4822a4

Please sign in to comment.