UnittestTester operational and used for unit tests

developer_tools/rook.ini

@@ -1,4 +1,4 @@
 [rook]
 add_non_default_run_types = qsub
-testers_dir = HERON/src/Testers
+testers_dir = HERON/src/Testers, src/Testers
 test_dir = tests

run_tests

@@ -91,7 +91,7 @@ case $TEST_SET in
         ;;
 esac
 
-$PYTHON_COMMAND $SCRIPT_DIR/raven/rook/main.py --config-file=$SCRIPT_DIR/developer_tools/rook.ini --test-dir $TEST_DIR --testers-dir $RAVEN_DIR/scripts/TestHarness/testers,$RAVEN_DIR/../HERON/src/Testers "${ARGS[@]}"
+$PYTHON_COMMAND $SCRIPT_DIR/raven/rook/main.py --config-file=$SCRIPT_DIR/developer_tools/rook.ini --test-dir $TEST_DIR --testers-dir $RAVEN_DIR/scripts/TestHarness/testers,$RAVEN_DIR/../HERON/src/Testers,$RAVEN_DIR/../src/Testers "${ARGS[@]}"
 
 # store return codes individually (rc) and combined (ALL_PASS)
 rc=$?

UnittestTester.py → src/Testers/UnittestTester.py

@@ -1,14 +1,19 @@
 import os
-from raven.scripts import library_handler
-from raven.scripts.TestHarness.testers import RavenPython
+import sys
+
+FORCE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+sys.path.append(FORCE_DIR)
+from raven.scripts.TestHarness.testers.RavenPython import RavenPython
+# clear scripts from path
+sys.path.pop()
 
 try:
   import unittest
   unittest_found = True
 except ModuleNotFoundError or ImportError:
   unittest_found = False
 
-class UnittestTester(RavenPython):
+class Unittest(RavenPython):
   """
   This class simplifies use of the unittest module for running unit tests through rook.
   """
@@ -22,8 +27,8 @@ def get_valid_params():
       @ Out, params, _ValidParameters, the parameters for this class.
     """
     params = RavenPython.get_valid_params()
+    # 'input' param can be test case or test suite; unittest will handle either when called
     params.add_param('unittest_args', '', "Arguments to the unittest module")
-    params.add_param('test_sequence_to_run', '', "Ordered list of test cases in the input file to run")
     return params
 
   def __init__(self, name, params):
@@ -62,4 +67,4 @@ def get_command(self):
       pythonCommand = self._get_python_command()
     else:
       pythonCommand = self.specs["python_command"]
-    return pythonCommand+" "+self.specs["input"]
+    return ' '.join([pythonCommand, '-m unittest', self.specs["unittest_args"], self.specs["input"]])

tests/unit_tests/tests

@@ -1,46 +1,46 @@
 [Tests]
   [./TestMinimalInput]
-    type = RavenPython
-    input = '-m unittest test_heron.TestMinimalInput'
+    type = Unittest
+    input = 'test_heron.TestMinimalInput'
   [../]
 
   [./TestExpandedInput1]
-    type = RavenPython
-    input = '-m unittest test_heron.TestExpandedInput1'
+    type = Unittest
+    input = 'test_heron.TestExpandedInput1'
   [../]
 
   [./TestExpandedInput2]
-    type = RavenPython
-    input = '-m unittest test_heron.TestExpandedInput2'
+    type = Unittest
+    input = 'test_heron.TestExpandedInput2'
   [../]
 
   [./TestNoComponentsNode]
-    type = RavenPython
-    input = '-m unittest test_heron.TestNoComponentsNode'
+    type = Unittest
+    input = 'test_heron.TestNoComponentsNode'
   [../]
 
   [./TestNoComponentNodes]
-    type = RavenPython
-    input = '-m unittest test_heron.TestNoComponentNodes'
+    type = Unittest
+    input = 'test_heron.TestNoComponentNodes'
   [../]
 
   [./TestMissingSubnodes]
-    type = RavenPython
-    input = '-m unittest test_heron.TestMissingSubnodes'
+    type = Unittest
+    input = 'test_heron.TestMissingSubnodes'
   [../]
 
   [./TestEmptyCompSetsFolder]
-    type = RavenPython
-    input = '-m unittest test_heron.TestEmptyCompSetsFolder'
+    type = Unittest
+    input = 'test_heron.TestEmptyCompSetsFolder'
   [../]
 
   [./TestCompSetsFolderWithBadJSON]
-    type = RavenPython
-    input = '-m unittest test_heron.TestCompSetsFolderWithBadJSON'
+    type = Unittest
+    input = 'test_heron.TestCompSetsFolderWithBadJSON'
   [../]
 
   [./TestCompSetsFolderMultFiles]
-    type = RavenPython
-    input = '-m unittest test_heron.TestCompSetsFolderMultFiles'
+    type = Unittest
+    input = 'test_heron.TestCompSetsFolderMultFiles'
   [../]
 []