Merge pull request #34 from DilumAluthge-forks/dpa/testset

Put the entire test suite inside a top-level `@testset`

Author: kleinhenz

test/runtests.jl

@@ -15,41 +15,44 @@ else
   ENV["JULIA_DEBUG"] = original_JULIA_DEBUG * ",SlurmClusterManager"
 end
 
-# test that slurm is available
-@test !(Sys.which("sinfo") === nothing)
-
-# submit job
-# project should point to top level dir so that SlurmClusterManager is available to script.jl
-project_path = abspath(joinpath(@__DIR__, ".."))
-println("project_path = $project_path")
-jobid = withenv("JULIA_PROJECT"=>project_path) do
-  strip(read(`sbatch --export=ALL --parsable -n 4 -o test.out script.jl`, String))
-end
-println("jobid = $jobid")
-
-# get job state from jobid
-getjobstate = jobid -> begin
-  cmd = Cmd(`scontrol show jobid=$jobid`, ignorestatus=true)
-  info = read(cmd, String)
-  state = match(r"JobState=(\S*)", info)
-  return state === nothing ? nothing : state.captures[1]
-end
-
-# wait for job to complete
-status = timedwait(60.0, pollint=1.0) do
+@testset "SlurmClusterManager.jl" begin
+  # test that slurm is available
+  @test !(Sys.which("sinfo") === nothing)
+  
+  # submit job
+  # project should point to top level dir so that SlurmClusterManager is available to script.jl
+  project_path = abspath(joinpath(@__DIR__, ".."))
+  println("project_path = $project_path")
+  jobid = withenv("JULIA_PROJECT"=>project_path) do
+    strip(read(`sbatch --export=ALL --parsable -n 4 -o test.out script.jl`, String))
+  end
+  println("jobid = $jobid")
+  
+  # get job state from jobid
+  getjobstate = jobid -> begin
+    cmd = Cmd(`scontrol show jobid=$jobid`, ignorestatus=true)
+    info = read(cmd, String)
+    state = match(r"JobState=(\S*)", info)
+    return state === nothing ? nothing : state.captures[1]
+  end
+  
+  # wait for job to complete
+  status = timedwait(60.0, pollint=1.0) do
+    state = getjobstate(jobid)
+    state == nothing && return false
+    println("jobstate = $state")
+    return state == "COMPLETED" || state == "FAILED"
+  end
+  
   state = getjobstate(jobid)
-  state == nothing && return false
-  println("jobstate = $state")
-  return state == "COMPLETED" || state == "FAILED"
-end
-
-state = getjobstate(jobid)
-
-# check that job finished running within timelimit (either completed or failed)
-@test status == :ok
-@test state == "COMPLETED"
-
-# print job output
-output = read("test.out", String)
-println("script output:")
-println(output)
+  
+  # check that job finished running within timelimit (either completed or failed)
+  @test status == :ok
+  @test state == "COMPLETED"
+  
+  # print job output
+  output = read("test.out", String)
+  println("script output:")
+  println(output)
+
+end # testset "SlurmClusterManager.jl"