test: avoid race condition for download

Author: scivision

+gemini3d/+fileio/download_and_extract.m

@@ -2,16 +2,15 @@ function download_and_extract(name, data_dir, url_ini)
 % download reference data by test name
 %
 % example:
-%  download_and_extract('3d_fang', '~/data')
+%  gemini3d.fileio.download_and_extract('3d_fang', '/tmp/data')
 arguments
-  name (1,1) string
-  data_dir (1,1) string
-  url_ini string = string.empty
+  name {mustBeTextScalar}
+  data_dir {mustBeTextScalar}
+  url_ini {mustBeTextScalar} = ''
 end
 
 gemini3d.sys.check_stdlib()
 
-data_dir = stdlib.expanduser(data_dir);
 test_dir = fullfile(data_dir, name);
 
 archive = download_data(name, data_dir, url_ini);
@@ -23,7 +22,7 @@ function download_and_extract(name, data_dir, url_ini)
 
 function archive = download_data(name, data_dir, url_file)
 
-if isempty(url_file)
+if ~strlength(url_file)
   lib_file = fullfile(gemini3d.root(), "../cmake/libraries.json");
   url_file = fullfile(gemini3d.root(), "../test/ref_data.json");
 
@@ -36,7 +35,7 @@ function download_and_extract(name, data_dir, url_ini)
 
 stdlib.makedir(data_dir)
 
-urls = jsondecode(fileread(stdlib.expanduser(url_file)));
+urls = jsondecode(fileread(url_file));
 
 archive = fullfile(data_dir, urls.tests.(name).archive);
 
@@ -53,11 +52,6 @@ function download_and_extract(name, data_dir, url_ini)
 
 
 function check_data(name, archive, urls)
-arguments
-  name (1,1) string
-  archive (1,1) string
-  urls (1,1) struct
-end
 
 if isfield(urls.(name), "sha256")
   disp("checking sha256sum of " + archive)

test/TestDryrun.m

@@ -1,7 +1,8 @@
 classdef TestDryrun < matlab.unittest.TestCase
 
 properties
-  TestData
+  datapath
+  outdir
 end
 
 methods(TestClassSetup)
@@ -39,15 +40,15 @@ function setup_sim(tc)
 name = "mini2dew_eq";
 
 cwd = fileparts(mfilename('fullpath'));
-tc.TestData.datapath = fullfile(cwd, "data", name);
+tc.datapath = fullfile(cwd, "data", name);
 
 % get files if needed
 try
   gemini3d.fileio.download_and_extract(name, fullfile(cwd, "data"))
 catch e
   catcher(e, tc)
 end
-tc.TestData.outdir = tc.createTemporaryFolder();
+tc.outdir = tc.createTemporaryFolder();
 end
 
 end
@@ -59,7 +60,7 @@ function setup_sim(tc)
 function test_dryrun(tc)
 
 try
-  gemini3d.run(tc.TestData.outdir, tc.TestData.datapath, dryrun=true)
+  gemini3d.run(tc.outdir, tc.datapath, dryrun=true)
 catch e
   catcher(e, tc)
 end

test/TestProject.m

@@ -178,7 +178,10 @@ function test_plot_2d(tc)
 
 tname = "mini2dew_glow";
 
-project_runner(tc, tname, fullfile(tc.cwd, "data"))
+gemini3d.fileio.download_and_extract("mini2dew_eq", tc.ref_dir)
+% need equil sim check to avoid race condition
+
+project_runner(tc, tname, tc.ref_dir)
 
 data_dir = fullfile(tc.cwd, "data", tname);
 
@@ -197,9 +200,13 @@ function test_plot_2d(tc)
 end
 
 function test_plot_3d(tc)
+
 tname = 'mini3d_glow';
 
-project_runner(tc, tname, fullfile(tc.cwd, "data"))
+gemini3d.fileio.download_and_extract("mini3d_eq", tc.ref_dir)
+% need equil sim check to avoid race condition
+
+project_runner(tc, tname, tc.ref_dir)
 
 % test 3D plots
 d3 = fullfile(tc.cwd, "data", tname);

test/private/project_runner.m

@@ -1,8 +1,8 @@
 function project_runner(tc, name, ref_dir)
 arguments
   tc (1,1) matlab.unittest.TestCase
-  name (1,1) string
-  ref_dir (1,1) string
+  name {mustBeTextScalar}
+  ref_dir {mustBeTextScalar}
 end
 
 test_dir = fullfile(ref_dir, name);