small test updates for jb/functions

longer timeout in sigint test `T()` should not be considered a `convert` call in replutil test.
JuliaLang · Jan 26, 2016 · e7050ad · e7050ad
1 parent 3394e47
commit e7050ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/test/core.jl b/test/core.jl
@@ -2212,7 +2212,7 @@ end
     @test_throws InterruptException begin
         #ccall(:raise, Void, (Cint,), 2) # llvm installs a custom version on Darwin that resolves to pthread_kill(pthread_self(), sig), which isn't what we want
         ccall(:kill, Void, (Cint, Cint,), getpid(), 2)
-        Libc.systemsleep(0.1) # wait for SIGINT to arrive
+        Libc.systemsleep(0.2) # wait for SIGINT to arrive
     end
     ccall(:jl_exit_on_sigint, Void, (Cint,), 1)
 end
@@ -3540,7 +3540,7 @@ f14339{T<:Union{}}(x::T, y::T) = 0
 module JLCall14301
 
 # Define f
-f() = 1
+function f end
 
 let i = Any[[1.23], [2.34]]
     # f() with capture variables

diff --git a/test/replutil.jl b/test/replutil.jl
@@ -122,9 +122,7 @@ end
 abstract T11007
 let
     err_str = @except_str T11007()
-    @test contains(err_str, "convert")
-    @test contains(err_str, "constructor")
-    @test contains(err_str, "T11007(...)")
+    @test contains(err_str, "no method matching T11007()")
 end
 
 # issue 11845