Updated tests to use Python TestHarness

tests/test_basic/results.py

@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-
-sys.path.insert(0, '../..')
-from openmc.statepoint import StatePoint
-
-# read in statepoint file
-if len(sys.argv) > 1:
-    sp = StatePoint(sys.argv[1])
-else:
-    sp = StatePoint('statepoint.10.binary')
-sp.read_results()
-
-# set up output string
-outstr = ''
- 
-# write out k-combined
-outstr += 'k-combined:\n'
-outstr += "{0:12.6E} {1:12.6E}\n".format(sp.k_combined[0], sp.k_combined[1])
-
-# write results to file
-with open('results_test.dat','w') as fh:
-    fh.write(outstr)

tests/test_basic/test_basic.py

@@ -1,60 +1,10 @@
 #!/usr/bin/env python
 
-import os
 import sys
-from subprocess import Popen, STDOUT, PIPE, call
-import filecmp
-import glob
-from optparse import OptionParser
+sys.path.insert(0, '..')
+from testing_harness import TestHarness
 
-parser = OptionParser()
-parser.add_option('--mpi_exec', dest='mpi_exec', default='')
-parser.add_option('--mpi_np', dest='mpi_np', default='3')
-parser.add_option('--exe', dest='exe')
-(opts, args) = parser.parse_args()
-cwd = os.getcwd()
-
-def test_run():
-    if opts.mpi_exec != '':
-        proc = Popen([opts.mpi_exec, '-np', opts.mpi_np, opts.exe, cwd],
-               stderr=STDOUT, stdout=PIPE)
-    else:
-        proc = Popen([opts.exe, cwd], stderr=STDOUT, stdout=PIPE)
-    print(proc.communicate()[0])
-    returncode = proc.returncode
-    assert returncode == 0, 'OpenMC did not exit successfully.'
-
-def test_created_statepoint():
-    statepoint = glob.glob(os.path.join(cwd, 'statepoint.10.*'))
-    assert len(statepoint) == 1, 'Either multiple or no statepoint files exist.'
-    assert statepoint[0].endswith('binary') or statepoint[0].endswith('h5'),\
-        'Statepoint file is not a binary or hdf5 file.'
-
-def test_results():
-    statepoint = glob.glob(os.path.join(cwd, 'statepoint.10.*'))
-    call([sys.executable, 'results.py', statepoint[0]])
-    compare = filecmp.cmp('results_test.dat', 'results_true.dat')
-    if not compare:
-      os.rename('results_test.dat', 'results_error.dat')
-    assert compare, 'Results do not agree.'
-
-def teardown():
-    output = glob.glob(os.path.join(cwd, 'statepoint.10.*'))
-    output.append(os.path.join(cwd, 'results_test.dat'))
-    for f in output:
-        if os.path.exists(f):
-            os.remove(f)
 
 if __name__ == '__main__':
-
-    # test for openmc executable
-    if opts.exe is None:
-        raise Exception('Must specify OpenMC executable from command line with --exe.')
-
-    # run tests
-    try:
-        test_run()
-        test_created_statepoint()
-        test_results()
-    finally:
-        teardown()
+    harness = TestHarness('statepoint.10.*')
+    harness.execute_test()