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

Rename _rc -> _config #3786

Merged
merged 1 commit into from
Aug 25, 2020
Merged

Rename _rc -> _config #3786

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
10 changes: 5 additions & 5 deletions cylc/flow/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,16 +1963,16 @@ def command_take_checkpoints(self, name):

def filter_initial_task_list(self, inlist):
"""Return list of initial tasks after applying a filter."""
included_by_rc = self.config.cfg[
included_by_config = self.config.cfg[
'scheduling']['special tasks']['include at start-up']
excluded_by_rc = self.config.cfg[
excluded_by_config = self.config.cfg[
'scheduling']['special tasks']['exclude at start-up']
outlist = []
for name in inlist:
if name in excluded_by_rc:
if name in excluded_by_config:
continue
if len(included_by_rc) > 0:
if name not in included_by_rc:
if len(included_by_config) > 0:
if name not in included_by_config:
continue
outlist.append(name)
return outlist
Expand Down
14 changes: 7 additions & 7 deletions tests/functional/startup/01-log-flow-config.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ run.cylc
__OUT__

LOGD="${RUN_DIR}/${SUITE_NAME}/log/flow-config"
RUN_RC="$(ls "${LOGD}/"*-run.cylc)"
REL_RC="$(ls "${LOGD}/"*-reload.cylc)"
RES_RC="$(ls "${LOGD}/"*-restart.cylc)"
RUN_CONFIG="$(ls "${LOGD}/"*-run.cylc)"
REL_CONFIG="$(ls "${LOGD}/"*-reload.cylc)"
RES_CONFIG="$(ls "${LOGD}/"*-restart.cylc)"
# The generated *-run.cylc and *-reload.cylc should be identical
# The generated *.cylc files should validate
cmp_ok "${RUN_RC}" "${REL_RC}"
run_ok "${TEST_NAME_BASE}-validate-run-rc" cylc validate "${RUN_RC}"
run_ok "${TEST_NAME_BASE}-validate-restart-rc" cylc validate "${RES_RC}"
cmp_ok "${RUN_CONFIG}" "${REL_CONFIG}"
run_ok "${TEST_NAME_BASE}-validate-run-config" cylc validate "${RUN_CONFIG}"
run_ok "${TEST_NAME_BASE}-validate-restart-config" cylc validate "${RES_CONFIG}"

diff -u "${RUN_RC}" "${RES_RC}" >'diff.out'
diff -u "${RUN_CONFIG}" "${RES_CONFIG}" >'diff.out'
contains_ok 'diff.out' <<'__DIFF__'
- description = the weather is bad
+ description = the weather is good
Expand Down