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.

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

suite_state: don't return null db results #2440

Merged
merged 2 commits into from
Oct 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion lib/cylc/dbstatecheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ def suite_state_query(

res = []
for row in self.conn.execute(stmt, stmt_args):
res.append(list(row))
if not all(v is None for v in row):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(there might be a better way to do this?)

res.append(list(row))

return res

Expand Down
35 changes: 35 additions & 0 deletions tests/suite-state/07-message2.t
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/bin/bash
# THIS FILE IS PART OF THE CYLC SUITE ENGINE.
# Copyright (C) 2008-2017 NIWA
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

# Test suite-state message query on a waiting task - GitHub #2440.

. $(dirname $0)/test_header
set_test_number 4

install_suite $TEST_NAME_BASE $TEST_NAME_BASE

run_ok ${TEST_NAME_BASE}-val cylc validate $SUITE_NAME

suite_run_ok ${TEST_NAME_BASE}-run cylc run --debug $SUITE_NAME

TEST_NAME=${TEST_NAME_BASE}-query
run_fail ${TEST_NAME} cylc suite-state \
$SUITE_NAME -p 2013 -t foo --max-polls=1 -m "the quick brown fox"

grep_ok "ERROR: condition not satisfied" ${TEST_NAME}.stderr

purge_suite $SUITE_NAME
15 changes: 15 additions & 0 deletions tests/suite-state/07-message2/suite.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[cylc]
cycle point format = %Y
[scheduling]
initial cycle point = 2010
final cycle point = 2012
[[dependencies]]
[[[P1Y]]]
graph = "foo:x => bar"
[runtime]
[[foo]]
script = cylc message "the quick brown fox"
[[[outputs]]]
x = "the quick brown fox"
[[bar]]
script = true