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

Fix site-only tests #2328

Merged
merged 1 commit into from
Jun 23, 2017
Merged

Fix site-only tests #2328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 bin/cylc-submit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def main():
task_job_mgr.proc_pool.close()
task_job_mgr.proc_pool.join()
for itask in itasks:
if itask.summary['submit_method_id'] is not None:
if itask.summary.get('submit_method_id') is not None:
print('[%s] Job ID: %s' % (
itask.identity, itask.summary['submit_method_id']))
if itask.state.status == TASK_STATUS_SUBMIT_FAILED:
Expand Down
2 changes: 1 addition & 1 deletion tests/authentication/08-shared-fs.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ poll '!' grep -q -F 't1.19700101T0000Z failed' "${SUITE_LOG}" 2>'/dev/null'

run_ok "${TEST_NAME_BASE}-broadcast" \
cylc broadcast -n 't1' -s '[environment]CYLC_TEST_VAR_FOO=foo' "${SUITE_NAME}"

sleep 1
run_ok "${TEST_NAME_BASE}-trigger" \
cylc trigger "${SUITE_NAME}" 't1' '19700101T0000Z'

Expand Down
1 change: 1 addition & 0 deletions tests/cylc-cat-log/01-remote.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ job.custom-log
job.err
job.out
job.status
job.xtrace
__END__
#-------------------------------------------------------------------------------
# remote
Expand Down
2 changes: 1 addition & 1 deletion tests/cylc-kill/00-multi-hosts-compat.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ suite_run_ok "${TEST_NAME_BASE}-run" \

RUN_DIR="$(cylc get-global-config --print-run-dir)/${SUITE_NAME}"
LOG="${RUN_DIR}/log/suite/log"
sed -n 's/^.*\(cylc jobs-kill\)/\1/p' "${LOG}" | sort >'edited-suite-log'
sed -n 's/^.*\(cylc jobs-kill\)/\1/p' "${LOG}" | sort -u >'edited-suite-log'

sort >'edited-suite-log-ref' <<__LOG__
cylc jobs-kill --debug --host=${CYLC_TEST_HOST} -- '\$HOME/cylc-run/${SUITE_NAME}/log/job' 1/remote-1/01 1/remote-2/01
Expand Down
2 changes: 1 addition & 1 deletion tests/cylc-kill/01-multi-hosts.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ suite_run_ok "${TEST_NAME_BASE}-run" \

RUN_DIR="$(cylc get-global-config --print-run-dir)/${SUITE_NAME}"
LOG="${RUN_DIR}/log/suite/log"
sed -n 's/^.*\(cylc jobs-kill\)/\1/p' "${LOG}" | sort >'edited-suite-log'
sed -n 's/^.*\(cylc jobs-kill\)/\1/p' "${LOG}" | sort -u >'edited-suite-log'

sort >'edited-suite-log-ref' <<__LOG__
cylc jobs-kill --debug --host=${CYLC_TEST_HOST} -- '\$HOME/cylc-run/${SUITE_NAME}/log/job' 1/remote-1/01 1/remote-2/01
Expand Down
2 changes: 1 addition & 1 deletion tests/cylc-poll/04-poll-multi-hosts.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ suite_run_ok "${TEST_NAME_BASE}-run" \

RUN_DIR="$(cylc get-global-config --print-run-dir)/${SUITE_NAME}"
LOG="${RUN_DIR}/log/suite/log"
sed -n 's/^.*\(cylc jobs-poll\)/\1/p' "${LOG}" | sort >'edited-suite-log'
sed -n 's/^.*\(cylc jobs-poll\)/\1/p' "${LOG}" | sort -u >'edited-suite-log'

sort >'edited-suite-log-ref' <<__LOG__
cylc jobs-poll --debug --host=${CYLC_TEST_HOST} -- '\$HOME/cylc-run/${SUITE_NAME}/log/job' 1/remote-fail-1/01 1/remote-success-1/01 1/remote-success-2/01
Expand Down
2 changes: 1 addition & 1 deletion tests/job-submission/07-multi.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ suite_run_ok "${TEST_NAME_BASE}-run" \

RUN_DIR="$(cylc get-global-config --print-run-dir)/${SUITE_NAME}"
LOG="${RUN_DIR}/log/suite/log"
sed -n 's/^.*\(cylc jobs-submit\)/\1/p' "${LOG}" | sort >'edited-suite-log'
sed -n 's/^.*\(cylc jobs-submit\)/\1/p' "${LOG}" | sort -u >'edited-suite-log'

sort >'edited-suite-log-ref' <<__LOG__
cylc jobs-submit --debug -- ${RUN_DIR}/log/job 20200101T0000Z/t0/01 20200101T0000Z/t1/01 20200101T0000Z/t2/01 20200101T0000Z/t3/01
Expand Down