From ede72312f4a052049f520570c4ec6cee6aa48389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8egh?= <dhoegh91@gmail.com>
Date: Sat, 13 Aug 2016 13:17:43 +0200
Subject: [PATCH] Move env.jl test to separate test file

(cherry picked from commit 30afe08b5d4af597588551e132c67a51974557a4)
ref #18012
---
 test/choosetests.jl |  2 +-
 test/env.jl         | 32 ++++++++++++++++++++++++++++++++
 test/sysinfo.jl     | 31 -------------------------------
 3 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 test/env.jl

diff --git a/test/choosetests.jl b/test/choosetests.jl
index d02ed1dcf3cf0..f15e61a139d6c 100644
--- a/test/choosetests.jl
+++ b/test/choosetests.jl
@@ -26,7 +26,7 @@ function choosetests(choices = [])
         "priorityqueue", "file", "read", "mmap", "version", "resolve",
         "pollfd", "mpfr", "broadcast", "complex", "socket",
         "floatapprox", "datafmt", "reflection", "regex", "float16",
-        "combinatorics", "sysinfo", "rounding", "ranges", "mod2pi",
+        "combinatorics", "sysinfo", "env", "rounding", "ranges", "mod2pi",
         "euler", "show", "lineedit", "replcompletions", "repl",
         "replutil", "sets", "test", "goto", "llvmcall", "grisu",
         "nullable", "meta", "stacktraces", "profile", "libgit2", "docs",
diff --git a/test/env.jl b/test/env.jl
new file mode 100644
index 0000000000000..592c378cf65ee
--- /dev/null
+++ b/test/env.jl
@@ -0,0 +1,32 @@
+# This file is a part of Julia. License is MIT: http://julialang.org/license
+
+@test !("f=a=k=e=n=a=m=e" ∈ keys(ENV))
+
+# issue #10994
+@test_throws ArgumentError ENV["bad\0name"] = "ok"
+@test_throws ArgumentError ENV["okname"] = "bad\0val"
+@test_throws ArgumentError Sys.set_process_title("bad\0title")
+
+withenv("bad"=>"dog") do
+    @test_throws ArgumentError ENV["bad\0cat"]
+end
+
+# issue #11170
+withenv("TEST"=>"nonempty") do
+    @test ENV["TEST"] == "nonempty"
+end
+withenv("TEST"=>"") do
+    @test ENV["TEST"] == ""
+end
+
+let c = collect(ENV)
+    @test isa(c, Vector)
+    @test length(ENV) == length(c)
+    @test isempty(ENV) || first(ENV) in c
+end
+
+# test for non-existent keys
+key = randstring(25)
+@test !haskey(ENV,key)
+@test_throws KeyError ENV[key]
+@test get(ENV,key,"default") == "default"
diff --git a/test/sysinfo.jl b/test/sysinfo.jl
index 645c34efce765..261935ac715f1 100644
--- a/test/sysinfo.jl
+++ b/test/sysinfo.jl
@@ -6,34 +6,3 @@
 sprint(Base.Sys.cpu_summary)
 @test Base.Sys.uptime() > 0
 Base.Sys.loadavg()
-
-@test !("f=a=k=e=n=a=m=e" ∈ keys(ENV))
-
-# issue #10994
-@test_throws ArgumentError ENV["bad\0name"] = "ok"
-@test_throws ArgumentError ENV["okname"] = "bad\0val"
-@test_throws ArgumentError Sys.set_process_title("bad\0title")
-
-withenv("bad"=>"dog") do
-    @test_throws ArgumentError ENV["bad\0cat"]
-end
-
-# issue #11170
-withenv("TEST"=>"nonempty") do
-    @test ENV["TEST"] == "nonempty"
-end
-withenv("TEST"=>"") do
-    @test ENV["TEST"] == ""
-end
-
-let c = collect(ENV)
-    @test isa(c, Vector)
-    @test length(ENV) == length(c)
-    @test isempty(ENV) || first(ENV) in c
-end
-
-# test for non-existent keys
-key = randstring(25)
-@test !haskey(ENV,key)
-@test_throws KeyError ENV[key]
-@test get(ENV,key,"default") == "default"