fix(tests): use keepable tmpdirs in pytest-cases POC

MODFLOW-USGS · Jan 18, 2023 · 19c9b14 · 19c9b14
1 parent 5cfeb20
commit 19c9b14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/autotest/test_gwf_maw04.py b/autotest/test_gwf_maw04.py
@@ -144,9 +144,9 @@ def well4(label):
 
 class GwfMaw04Cases:
     @parametrize(data=cases, ids=[c.name for c in cases])
-    def case_4(self, tmpdir, targets, data):
+    def case_4(self, function_tmpdir, targets, data):
         name = data.name
-        ws = str(tmpdir)
+        ws = str(function_tmpdir)
 
         # build MODFLOW 6 files
         sim = flopy.mf6.MFSimulation(
@@ -225,7 +225,7 @@ def case_4(self, tmpdir, targets, data):
             mc = None
         else:
             cmppth = "mf2005"
-            ws = os.path.join(str(tmpdir), cmppth)
+            ws = os.path.join(str(function_tmpdir), cmppth)
             mc = flopy.modflow.Modflow(name, model_ws=ws, version=cmppth)
             dis = flopy.modflow.ModflowDis(
                 mc,

diff --git a/autotest/test_gwf_maw_cases.py b/autotest/test_gwf_maw_cases.py
@@ -147,12 +147,12 @@ class GwfMawCases:
     ]
 
     @parametrize(data=cases1, ids=[c.name for c in cases1])
-    def case_1(self, tmpdir, targets, data):
+    def case_1(self, function_tmpdir, targets, data):
         sim = flopy.mf6.MFSimulation(
             sim_name=data.name,
             version="mf6",
             exe_name=targets["mf6"],
-            sim_ws=str(tmpdir),
+            sim_ws=str(function_tmpdir),
         )
 
         # create tdis package
@@ -329,9 +329,9 @@ def eval_1(self, config, data):
     cases2 = [case2]
 
     @parametrize(data=cases2, ids=[c.name for c in cases2])
-    def case_2(self, tmpdir, targets, data):
+    def case_2(self, function_tmpdir, targets, data):
         name = data.name
-        ws = str(tmpdir)
+        ws = str(function_tmpdir)
         sim = flopy.mf6.MFSimulation(
             sim_name=name, version="mf6", exe_name=targets["mf6"], sim_ws=ws
         )
@@ -598,7 +598,7 @@ def eval_2(self, config, data):
     ]
 
     @parametrize(data=cases3, ids=[c.name for c in cases3])
-    def case_3(self, tmpdir, targets, data):
+    def case_3(self, function_tmpdir, targets, data):
         top = 0.0
         botm = [-1000.0]
 
@@ -607,7 +607,7 @@ def case_3(self, tmpdir, targets, data):
             tdis_rc.append((data.perlen[i], data.nstp[i], data.tsmult[i]))
 
         name = data.name
-        ws = str(tmpdir)
+        ws = str(function_tmpdir)
         sim = flopy.mf6.MFSimulation(
             sim_name=name, sim_ws=ws, exe_name=targets["mf6"]
         )
@@ -810,7 +810,7 @@ def eval_3(self, config, data):
     # ]
 
     # @parametrize(data=cases4, ids=[c['name'] for c in cases4])
-    # def case_4(self, tmpdir, targets, data):
+    # def case_4(self, function_tmpdir, targets, data):
     #     pass
 
     # def eval_4(self, sim, data):