Commits

Nathan Goldbaum committed 79ef09c

Fixes for previous commit.

  • Participants
  • Parent commits 7737918

Comments (0)

Files changed (1)

File run/Hydro/Hydro-1D/Toro-6-ShockTube/Toro-6-ShockTube__test_toro6.py

+import os
 from yt.mods import *
-from yt.funcs import *
 from yt.testing import *
+from yt.utilities.answer_testing.framework import \
+    VerifySimulationSameTest, \
+    sim_dir_load
 from yt.frontends.enzo.answer_testing_support import \
     requires_outputlog, \
     ShockTubeTest, \
     standard_small_simulation
-from yt.utilities.answer_testing.framework import \
-    sim_dir_load, \
-    VerifySimulationSameTest
-import os
 
 
 _data_file = 'DD0001/data0001'
 _rtol = 1.0e-6
 _atol = 1.0e-7
 
-# Verifies that OutputLog exists
-@requires_outputlog(os.path.dirname(__file__), "Toro-6-ShockTube.enzo")
-def test_toro6():
-    test = ShockTubeTest(_data_file, _solution_file, _fields, 
-                         _les, _res, _rtol, _atol)
-    return test()
 
 _base_fields = ('Density', 'TotalEnergy')
 
+@requires_outputlog(os.path.dirname(__file__), "Toro-6-ShockTube.enzo")
+
 def test_almost_standard():
     sim = sim_dir_load("Toro-6-ShockTube.enzo",
                        path="./Hydro/Hydro-1D/Toro-6-ShockTube",
     filename = os.path.dirname(__file__) + "/OutputLog"
     if not os.path.exists(filename):
         raise EnzoTestOutputFileNonExistent(filename)
+
+def test_toro6():
+    test = ShockTubeTest(_data_file, _solution_file, _fields, 
+                         _les, _res, _rtol, _atol)
+    return test()