fix windows 1.9

medyan-dev · Oct 3, 2023 · 915d8d6 · 915d8d6
1 parent 0f86fc4
commit 915d8d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 25 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -21,7 +21,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.8'
+          - '1.9'
+          - '~1.10.0-'
           - 'nightly'
         os:
           - ubuntu-latest

diff --git a/src/file-saving.jl b/src/file-saving.jl
@@ -27,7 +27,7 @@ end
 
 
 function in_new_log_dir(f, job_out::String)
-    date_part = Dates.format(Dates.now(),DATE_FORMAT)
+    date_part = Dates.format(Dates.now(),"yyyy-mm-ddTHH-MM-SS")
     rand_part = Random.randstring(RandomDevice(), 12)
     new_name = date_part*"_"*rand_part
     all_logs = mkpath(joinpath(job_out, "logs"))

diff --git a/test/test_ref_out.jl b/test/test_ref_out.jl
@@ -17,9 +17,9 @@ ref_out = joinpath(@__DIR__, "example/output-ref")
 warn_only_logger = MinLevelLogger(current_logger(), Logging.Warn);
 
 
-@testset "good example" begin
+@testset "full run example" begin
     for continue_sim in (true,false)
-        test_out = joinpath(@__DIR__, "example/output/good")
+        test_out = joinpath(@__DIR__, "example/output/full",continue_sim ? "con" : "start")
         rm(test_out; force=true, recursive=true)
         args = ["--out=$test_out","--batch=1"]
         continue_sim && push!(args,"--continue")
@@ -40,26 +40,7 @@ warn_only_logger = MinLevelLogger(current_logger(), Logging.Warn);
         end
     end
 end
-@testset "good example" begin
-    test_out = joinpath(@__DIR__, "example/output/good")
-    rm(test_out; force=true, recursive=true)
-    with_logger(warn_only_logger) do
-        MEDYANSimRunner.run_sim(["--out=$test_out","--batch=1","--continue"];
-            UserCode.jobs,
-            UserCode.setup,
-            UserCode.save_snapshot,
-            UserCode.load_snapshot,
-            UserCode.loop,
-            UserCode.done,
-        )
-    end
-    out_diff = sprint(MEDYANSimRunner.print_traj_diff, joinpath(ref_out,"1"), joinpath(test_out,"1"))
-    if !isempty(out_diff)
-        println(out_diff)
-        @test false
-    end
-end
-@testset "partial restart example $v" for v in 1:5
+@testset "partial restart example $v" for v in 1:4
     test_out = joinpath(@__DIR__, "example/output/restart $v")
     rm(test_out; force=true, recursive=true)
     mkpath(test_out)
@@ -80,7 +61,7 @@ end
         @test false
     end
 end
-@testset "partial continue example $v" for v in 1:5
+@testset "partial continue example $v" for v in 1:4
     test_out = joinpath(@__DIR__, "example/output/continue $v")
     rm(test_out; force=true, recursive=true)
     mkpath(test_out)