Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync HERON and TEAL #1298

Merged
merged 3 commits into from
Aug 4, 2020
Merged

Sync HERON and TEAL #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3092f9
update TEAL to tests-passing commit after TEAL#7
PaulTalbot-INL Aug 4, 2020
5237220
updated heron to fixes with teal
PaulTalbot-INL Aug 4, 2020
8584c5e
better crash handling for plugin tests
PaulTalbot-INL Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/HERON
Open in desktop
Submodule HERON updated 4 files
+13 −13 src/DispatchManager.py
+8 −8 src/_utils.py
+4 −4 templates/template_driver.py
+0 −29 tests/integration_tests/var_demand_var_price/write_inner.py
2 changes: 1 addition & 1 deletion plugins/TEAL
Open in desktop
Submodule TEAL updated 2 files
+5 −5 __init__.py
+2 −2 tests/HourlyObjectOrientedTest.py
12 changes: 10 additions & 2 deletions run_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,16 @@ if [[ $DO_PLUGINS == 0 ]]; then
echo Starting tests for plugin "$P" ...
# add RAVEN testers to plugin testers
ROOK_COMMAND="$PYTHON_COMMAND $SCRIPT_DIR/rook/main.py --test-dir $LOCATION --testers-dir $FRAMEWORK_DIR/../scripts/TestHarness/testers,$LOCATION/../src/Testers --add-non-default-run-types qsub ${ARGS[@]}"
$ROOK_COMMAND
rc=$?
echo Running ROOK command: "$ROOK_COMMAND" ...
{
# try
$ROOK_COMMAND
rc=$?
} || {
# catch
rc=1
}

ALL_PASS=$(($ALL_PASS + $rc))
if [[ $rc != 0 ]]; then
echo ... there were failed tests for plugin "$P"!
Expand Down