From 43a8a178741aa84a610de1cd45728320df87373e Mon Sep 17 00:00:00 2001 From: Caleb Sitton Date: Fri, 13 Dec 2024 10:29:46 -0700 Subject: [PATCH 1/4] Modified unit tests to use Unittest tester --- tests/unit_tests/tests | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/unit_tests/tests b/tests/unit_tests/tests index 4a340f4e..8bcaa970 100644 --- a/tests/unit_tests/tests +++ b/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' [../] [] From 5b55b76d9a4a4a7732d47ff7571374da286de980 Mon Sep 17 00:00:00 2001 From: Caleb Sitton Date: Fri, 13 Dec 2024 11:19:01 -0700 Subject: [PATCH 2/4] Fixed pathing issue --- check_py_coverage.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/check_py_coverage.sh b/check_py_coverage.sh index bebeff6d..45df5913 100755 --- a/check_py_coverage.sh +++ b/check_py_coverage.sh @@ -49,6 +49,10 @@ cd $SCRIPT_DIR #coverage help run SRC_DIR=`(cd src && pwd)` +if [[ "$SRC_DIR" == "/c"* ]] +then + SRC_DIR="C:${SRC_DIR:2}" +fi # get display var DISPLAY_VAR=`(echo $DISPLAY)` From 02464f7934bd32b99bf5602154e3c65c938df90f Mon Sep 17 00:00:00 2001 From: Caleb Sitton Date: Sat, 14 Dec 2024 11:19:49 -0700 Subject: [PATCH 3/4] Update testers in rook.ini --- developer_tools/rook.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/developer_tools/rook.ini b/developer_tools/rook.ini index b13eaeef..9048e7fb 100644 --- a/developer_tools/rook.ini +++ b/developer_tools/rook.ini @@ -1,4 +1,4 @@ [rook] add_non_default_run_types = qsub -testers_dir = HERON/src/Testers -test_dir = tests \ No newline at end of file +testers_dir = HERON/src/Testers, RAVEN/scripts/TestHarness/testers +test_dir = tests From 7c860bd15d798fbe8cafe213a05045d4a9a676c6 Mon Sep 17 00:00:00 2001 From: Caleb Sitton Date: Sat, 14 Dec 2024 11:32:16 -0700 Subject: [PATCH 4/4] Capitalization error --- developer_tools/rook.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developer_tools/rook.ini b/developer_tools/rook.ini index 9048e7fb..8a5ac11f 100644 --- a/developer_tools/rook.ini +++ b/developer_tools/rook.ini @@ -1,4 +1,4 @@ [rook] add_non_default_run_types = qsub -testers_dir = HERON/src/Testers, RAVEN/scripts/TestHarness/testers +testers_dir = HERON/src/Testers, raven/scripts/TestHarness/testers test_dir = tests