From 89c75a7b8242dfc794fb1073ad58f0dabcd06c73 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Tue, 16 Jul 2019 20:56:11 -0500
Subject: [PATCH] Sharing model between tests.

---
 .../dagmc/legacy/inputs_true.dat              |  1 -
 tests/regression_tests/dagmc/legacy/test.py   | 20 ++++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/tests/regression_tests/dagmc/legacy/inputs_true.dat b/tests/regression_tests/dagmc/legacy/inputs_true.dat
index 056a7eb9d3..b2b092cff0 100644
--- a/tests/regression_tests/dagmc/legacy/inputs_true.dat
+++ b/tests/regression_tests/dagmc/legacy/inputs_true.dat
@@ -22,7 +22,6 @@
       <parameters>-4 -4 -4 4 4 4</parameters>
     </space>
   </source>
-  <verbosity>7</verbosity>
   <temperature_tolerance>50.0</temperature_tolerance>
   <dagmc>true</dagmc>
 </settings>
diff --git a/tests/regression_tests/dagmc/legacy/test.py b/tests/regression_tests/dagmc/legacy/test.py
index 38c3c42675..1e4107cfbc 100644
--- a/tests/regression_tests/dagmc/legacy/test.py
+++ b/tests/regression_tests/dagmc/legacy/test.py
@@ -11,14 +11,8 @@ pytestmark = pytest.mark.skipif(
     not openmc.capi._dagmc_enabled(),
     reason="DAGMC CAD geometry is not enabled.")
 
-
-class DAGMCPyAPITestHarness(PyAPITestHarness):
-
-    def _compare_inputs(self):
-        super()._compare_inputs()
-
-
-def test_dagmc():
+@pytest.fixture(scope="module")
+def dagmc_model():
     model = openmc.model.Model()
 
     # settings
@@ -56,9 +50,10 @@ def test_dagmc():
     mats = openmc.Materials([u235, water])
     model.materials = mats
 
-    harness = PyAPITestHarness('statepoint.5.h5', model=model)
-    model.settings.verbosity = 1
-    harness._build_inputs()
+    yield model
+
+def test_dagmc_temps(dagmc_model):
+    dagmc_model.export_to_xml()
 
     # check cell temps as well here
     openmc.capi.init([])
@@ -73,5 +68,6 @@ def test_dagmc():
 
     openmc.capi.finalize()
 
-    model.settings.verbosity = 7
+def test_dagmc(dagmc_model):
+    harness = PyAPITestHarness('statepoint.5.h5', model=dagmc_model)
     harness.main()