fix merge test

m3g · Dec 1, 2023 · 93b7646 · 93b7646
1 parent 2311bcf
commit 93b7646
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/isapprox.jl b/src/isapprox.jl
@@ -19,7 +19,7 @@ function Base.isapprox(r1::T, r2::T; debug = false) where {T<:CMTypes}
     check = true
     diff_list = Symbol[]
     for field in fieldnames(T)
-        if field == :files
+        if field in [ :files, :Version ]
             continue
         end
         x = getfield(r1, field)

diff --git a/src/results.jl b/src/results.jl
@@ -576,12 +576,13 @@ end
     @test R.density.solvent ≈ 3 / R.volume.total
     @test R.density.solvent_bulk ≈ 2 / R.volume.bulk
 
+    # Test loading a saved merged file
     dir = "$(Testing.data_dir)/NAMD"
     atoms = readPDB("$dir/structure.pdb")
     tmao = Selection(select(atoms, "resname TMAO"), natomspermol = 14)
     water = Selection(select(atoms, "water"), natomspermol = 3)
 
-    # save(R,"$dir/merged.json")
+    #save(R,"$dir/merged.json")
     R_save = load("$dir/merged.json")
 
     options = Options(

diff --git a/test/data/NAMD/merged.json b/test/data/NAMD/merged.json