Merge pull request #109 from musm/tes

Clean up testing
JuliaIO · Feb 13, 2017 · 1e07cf3 · 1e07cf3
2 parents 662297f + ae17138
commit 1e07cf3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 26 deletions.
diff --git a/test/REQUIRE b/test/REQUIRE
diff --git a/test/loadsave.jl b/test/loadsave.jl
@@ -1,10 +1,6 @@
-using FileIO, Compat
-if VERSION >= v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using FileIO
+using Base.Test
+using Compat
 
 # Stub readers---these might bork any existing readers, so don't
 # run these tests while doing other things!
@@ -198,4 +194,4 @@ end
 
 @testset "Absent file" begin
     @test_throws SystemError load("nonexistent.oops")
-end
+end
diff --git a/test/query.jl b/test/query.jl
@@ -1,10 +1,5 @@
 using FileIO
-if VERSION >= v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 using Compat
 import Compat.String
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,15 +1,8 @@
 using FileIO
-if VERSION >= v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 @testset "FileIO" begin
-	include("query.jl")
-	include("loadsave.jl")
-	include("error_handling.jl")
+    include("query.jl")
+    include("loadsave.jl")
+    include("error_handling.jl")
 end
-
-# make Travis fail when tests fail: