ci: convert addition autotests to use FlopyTestSetup testing class

autotest/t501_test.py

@@ -7,9 +7,9 @@
 
 def test_mf6():
     base_dir = base_test_dir(__file__, rel_path="temp", verbose=True)
-    test_setup = FlopyTestSetup(verbose=True, test_dirs=baseDir)
+    test_setup = FlopyTestSetup(verbose=True, test_dirs=base_dir)
 
-    sim = flopy.mf6.MFSimulation(sim_ws=baseDir)
+    sim = flopy.mf6.MFSimulation(sim_ws=base_dir)
     assert isinstance(sim, flopy.mf6.MFSimulation)
 
     tdis = flopy.mf6.modflow.mftdis.ModflowTdis(sim)
@@ -97,7 +97,7 @@ def test_mf6():
     sim.write_simulation()
 
     # Verify files were written
-    assert os.path.isfile(os.path.join(baseDir, "mfsim.nam"))
+    assert os.path.isfile(os.path.join(base_dir, "mfsim.nam"))
     exts_model = [
         "nam",
         "dis",
@@ -124,10 +124,10 @@ def test_mf6():
     ]
     exts_sim = ["gwfgwf", "ims", "tdis"]
     for ext in exts_model:
-        fname = os.path.join(baseDir, f"model.{ext}")
+        fname = os.path.join(base_dir, f"model.{ext}")
         assert os.path.isfile(fname), f"{fname} not found"
     for ext in exts_sim:
-        fname = os.path.join(baseDir, f"sim.{ext}")
+        fname = os.path.join(base_dir, f"sim.{ext}")
         assert os.path.isfile(fname), f"{fname} not found"
 
     return

autotest/t502_test.py

@@ -12,7 +12,7 @@
 
 def test_create_and_run_model():
 
-    test_setup = FlopyTestSetup(verbose=True, test_dirs=baseDir)
+    test_setup = FlopyTestSetup(verbose=True, test_dirs=base_dir)
 
     # names
     sim_name = "testsim"
@@ -22,7 +22,7 @@ def test_create_and_run_model():
     # set up simulation
     tdis_name = f"{sim_name}.tdis"
     sim = MFSimulation(
-        sim_name=sim_name, version="mf6", exe_name=exe_name, sim_ws=baseDir
+        sim_name=sim_name, version="mf6", exe_name=exe_name, sim_ws=base_dir
     )
     tdis_rc = [(6.0, 2, 1.0), (6.0, 3, 1.0)]
     tdis = mftdis.ModflowTdis(

autotest/t503_test.py

@@ -37,12 +37,12 @@
     print(f"  {exdir}")
 
 
-def copy_folder(baseDir, src):
+def copy_folder(base_dir, src):
     subDir = src.partition("{0}mf6examples{0}".format(os.path.sep))[2]
-    if os.path.basename(subDir) in os.path.basename(baseDir):
-        dst = baseDir
+    if os.path.basename(subDir) in os.path.basename(base_dir):
+        dst = base_dir
     else:
-        dst = os.path.join(baseDir, subDir)
+        dst = os.path.join(base_dir, subDir)
 
     # clean the destination directory if it exists
     if os.path.isdir(dst):
@@ -58,9 +58,9 @@ def copy_folder(baseDir, src):
     return dst
 
 
-def simulation_subdirs(baseDir):
+def simulation_subdirs(base_dir):
     exsubdirs = []
-    for dirName, subdirList, fileList in os.walk(baseDir):
+    for dirName, subdirList, fileList in os.walk(base_dir):
         for file_name in fileList:
             if file_name.lower() == "mfsim.nam":
                 print(f"Found directory: {dirName}")
@@ -78,7 +78,7 @@ def runmodel(exdir):
 
     simulations = simulation_subdirs(exdir)
     for src in simulations:
-        ws = copy_folder(baseDir, src)
+        ws = copy_folder(base_dir, src)
         test_setup.add_test_dir(ws)
         f = os.path.basename(os.path.normpath(ws))
         print("\n\n")
@@ -129,7 +129,7 @@ def runmodel(exdir):
             )
             assert success, f"comparision for {ws} failed"
 
-    test_setup.add_test_dir(baseDir)
+    test_setup.add_test_dir(base_dir)
 
 
 # for running tests with pytest