Merge pull request #149 from TotalVerb/pass-the-tests-without-warnings

Fix @os_only deprecation warnings
JuliaIO · Jun 12, 2016 · bec34de · bec34de
2 parents db54323 + 048d7da
commit bec34de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,2 +1,2 @@
 julia 0.3
-Compat 0.7.16
+Compat 0.7.20
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -211,9 +211,12 @@ obj = JSON.parse("{\"\U0001d712\":\"\\ud835\\udf12\"}")
 tmppath, io = mktemp()
 write(io, facebook)
 close(io)
-@unix_only @test haskey(JSON.parsefile(tmppath), "data")
-# don't use mmap on Windows, to avoid ERROR: unlink: operation not permitted (EPERM)
-@windows_only @test haskey(JSON.parsefile(tmppath; use_mmap=false), "data")
+if is_windows()
+    # don't use mmap on Windows, to avoid ERROR: unlink: operation not permitted (EPERM)
+    @test haskey(JSON.parsefile(tmppath; use_mmap=false), "data")
+else
+    @test haskey(JSON.parsefile(tmppath), "data")
+end
 rm(tmppath)
 
 # check indented json has same final value as non indented