Skip to content

Commit 1e07cf3

Browse files
authored
Merge pull request #109 from musm/tes
Clean up testing
2 parents 662297f + ae17138 commit 1e07cf3

File tree

4 files changed

+9
-26
lines changed

4 files changed

+9
-26
lines changed

test/REQUIRE

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/loadsave.jl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
using FileIO, Compat
2-
if VERSION >= v"0.5.0-dev+7720"
3-
using Base.Test
4-
else
5-
using BaseTestNext
6-
const Test = BaseTestNext
7-
end
1+
using FileIO
2+
using Base.Test
3+
using Compat
84

95
# Stub readers---these might bork any existing readers, so don't
106
# run these tests while doing other things!
@@ -198,4 +194,4 @@ end
198194

199195
@testset "Absent file" begin
200196
@test_throws SystemError load("nonexistent.oops")
201-
end
197+
end

test/query.jl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
using FileIO
2-
if VERSION >= v"0.5.0-dev+7720"
3-
using Base.Test
4-
else
5-
using BaseTestNext
6-
const Test = BaseTestNext
7-
end
2+
using Base.Test
83
using Compat
94
import Compat.String
105

test/runtests.jl

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
using FileIO
2-
if VERSION >= v"0.5.0-dev+7720"
3-
using Base.Test
4-
else
5-
using BaseTestNext
6-
const Test = BaseTestNext
7-
end
2+
using Base.Test
83

94
@testset "FileIO" begin
10-
include("query.jl")
11-
include("loadsave.jl")
12-
include("error_handling.jl")
5+
include("query.jl")
6+
include("loadsave.jl")
7+
include("error_handling.jl")
138
end
14-
15-
# make Travis fail when tests fail:

0 commit comments

Comments
 (0)