diff --git a/bin/cylc-restart b/bin/cylc-restart
index 54a68417cdb..15e82548f87 100755
--- a/bin/cylc-restart
+++ b/bin/cylc-restart
@@ -455,7 +455,7 @@ where they got to while the suite was down."""
else:
raise Exception( 'ERROR: unknown task state for ' + itask.id )
- self.pool.add( itask )
+ self.pool.add_to_runahead_pool( itask )
if __name__ == '__main__':
diff --git a/bin/cylc-run b/bin/cylc-run
index b6ba855d7e9..9bee0b36682 100755
--- a/bin/cylc-run
+++ b/bin/cylc-run
@@ -128,7 +128,7 @@ initial and final cycle point variables persists across suite restarts."""
itask = self.config.get_task_proxy( name, tag, 'waiting', stopctime=None, startup=True, submit_num=0, exists=False )
if itask.tag:
- self.pool.add( itask )
+ self.pool.add_to_runahead_pool( itask )
else:
self.log.info( "Not loading " + name + " (out of sequence bounds)" )
del itask
@@ -157,7 +157,7 @@ initial and final cycle point variables persists across suite restarts."""
itask.prerequisites.set_all_satisfied()
itask.outputs.set_all_completed()
- self.pool.add( itask )
+ self.pool.add_to_runahead_pool( itask )
def load_tasks_raw( self ):
if self.start_point is not None:
@@ -180,7 +180,7 @@ initial and final cycle point variables persists across suite restarts."""
del itask
continue
- self.pool.add( itask )
+ self.pool.add_to_runahead_pool( itask )
if __name__ == '__main__':
main("run", start)
diff --git a/lib/cylc/scheduler.py b/lib/cylc/scheduler.py
index 4426ac7cb49..77d9559befe 100644
--- a/lib/cylc/scheduler.py
+++ b/lib/cylc/scheduler.py
@@ -564,7 +564,7 @@ def command_insert_task( self, name, tag, is_family, stop_string ):
# TODO - insertion of start-up tasks? (startup=False is assumed here)
new_task = self.config.get_task_proxy( name, point, 'waiting', stop_point, startup=False, submit_num=self.db.get_task_current_submit_num(name, tag), exists=self.db.get_task_state_exists(name, tag))
if new_task:
- self.pool.add( new_task )
+ self.pool.add_to_runahead_pool( new_task )
def command_nudge( self ):
diff --git a/lib/cylc/task_pool.py b/lib/cylc/task_pool.py
index 303f62fec98..701ca2002ce 100644
--- a/lib/cylc/task_pool.py
+++ b/lib/cylc/task_pool.py
@@ -100,47 +100,54 @@ def assign_queues( self ):
self.myq[taskname] = queue
-
- def add( self, itask ):
-
+ def add_to_runahead_pool( self, itask ):
+ """Add a new task to the runahead pool if possible.
+ Tasks whose recurrences allow them to spawn beyond the suite
+ stop point are added to the pool in the held state, ready to be
+ released if the suite stop point is changed."""
+
+ # do not add if a task with the same ID already exists
+ # e.g. an inserted task caught up with an existing one
if self.id_exists( itask.id ):
- # e.g. an inserted task caught up with an existing one with the same ID.
- self.log.warning( itask.id + ' cannot be added: task ID already exists' )
+ self.log.warning( itask.id + ' cannot be added to pool: task ID already exists' )
+ del itask
return False
- # TODO ISO - no longer needed due to recurrence bounds?
+ # do not add if an inserted task is beyond its own stop point
+ # (note this is not the same as recurrence bounds)
if itask.stop_c_time and itask.c_time > itask.stop_c_time:
- itask.log( 'WARNING', "not adding (beyond my stop cycle)" )
+ self.log.info( itask.id + ' not adding to pool: beyond task stop cycle' )
+ del itask
return False
-
- # check cycle stop or hold conditions
+
+ # add in held state if beyond the suite stop point
if self.stop_point and itask.c_time > self.stop_point:
- # itask.log( 'WARNING', "not adding (beyond suite stop cycle) " + str(self.stop_point) )
+ itask.log( 'NORMAL', "holding (beyond suite stop point) " + str(self.stop_point) )
itask.reset_state_held()
- # return
- # TODO ISO -restore suite hold functionality
- #if self.hold_time and itask.c_time > self.hold_time:
- # itask.log( 'DEBUG', "not adding (beyond suite hold cycle) " + str(self.hold_time) )
+ # add in held state if beyond the suite hold point
+ # TODO ISO -restore this functionality
+ #elif self.hold_time and itask.c_time > self.hold_time:
+ # itask.log( 'NORMAL', "holding (beyond suite hold point) " + str(self.hold_time) )
# itask.reset_state_held()
- # return
- # hold tasks with future triggers beyond the final cycle point
- if self.task_has_future_trigger_overrun( itask ):
- itask.log( "WARNING", "not adding (future trigger beyond stop cycle)" )
+ # add in held state if a future trigger goes beyond the suite stop point
+ # (note this only applies to tasks below the suite stop point themselves)
+ elif self.task_has_future_trigger_overrun( itask ):
+ itask.log( "NORMAL", "holding (future trigger beyond stop point)" )
self.held_future_tasks.append( itask.id )
itask.reset_state_held()
- return
+ # add to the runahead pool
self.runahead_pool[itask.id] = itask
-
self.rhpool_changed = True
-
return True
+
def get_task_proxy( self, *args, **kwargs ):
return self.config.get_task_proxy(*args, **kwargs)
+
def release_runahead_tasks( self ):
# compute runahead base: the oldest task not succeeded or failed
@@ -452,7 +459,7 @@ def reload_taskdefs( self ):
self.remove( itask, '(suite definition reload)' )
- self.add( new_task )
+ self.add_to_runahead_pool( new_task )
self.reconfiguring = found
@@ -631,7 +638,7 @@ def force_spawn( self, itask ):
itask.state.set_spawned()
itask.log( 'DEBUG', 'forced spawning')
new_task = itask.spawn( 'waiting' )
- if new_task and self.add( new_task ):
+ if new_task and self.add_to_runahead_pool( new_task ):
return new_task
else:
return None
diff --git a/tests/broadcast/00-simple.t b/tests/broadcast/00-simple.t
index 2b8550a566b..76f59e7e018 100644
--- a/tests/broadcast/00-simple.t
+++ b/tests/broadcast/00-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test broadcasts
+# Test broadcasts
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/broadcast/01-dependencies.t b/tests/broadcast/01-dependencies.t
index 2b8550a566b..76f59e7e018 100644
--- a/tests/broadcast/01-dependencies.t
+++ b/tests/broadcast/01-dependencies.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test broadcasts
+# Test broadcasts
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/broadcast/02-inherit.t b/tests/broadcast/02-inherit.t
index e43bf319fdd..6dbc4cf477e 100644
--- a/tests/broadcast/02-inherit.t
+++ b/tests/broadcast/02-inherit.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test broadcasts, with overriding inheritance.
+# Test broadcasts, with overriding inheritance.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/cat-log/00-local.t b/tests/cat-log/00-local.t
index 67b791fb463..9520ef776ab 100755
--- a/tests/cat-log/00-local.t
+++ b/tests/cat-log/00-local.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cat-log, localhost
+# Test cat-log, localhost
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 3
diff --git a/tests/cat-log/01-remote.t b/tests/cat-log/01-remote.t
index a5874b3a098..5f9b5afa1bb 100755
--- a/tests/cat-log/01-remote.t
+++ b/tests/cat-log/01-remote.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cat-log, localhost
+# Test cat-log, localhost
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
export CYLC_TEST_HOST=$(cylc get-global-config -i '[test battery]remote host')
diff --git a/tests/combined/00-simple.t b/tests/combined/00-simple.t
index d436a42862b..495d7d72440 100644
--- a/tests/combined/00-simple.t
+++ b/tests/combined/00-simple.t
@@ -15,8 +15,8 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test triggering of asynchronous one-off, synchronous one-off
-#C: (start-up), and cycling tasks in one suite.
+# Test triggering of asynchronous one-off, synchronous one-off
+# (start-up), and cycling tasks in one suite.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/cyclers/00-daily.t b/tests/cyclers/00-daily.t
index 52a5b299660..dd5ed0ac141 100644
--- a/tests/cyclers/00-daily.t
+++ b/tests/cyclers/00-daily.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test intercycle dependencies.
+# Test intercycle dependencies.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/cyclers/23-multidaily_local.t b/tests/cyclers/23-multidaily_local.t
index e9c5bece679..577b553d375 100644
--- a/tests/cyclers/23-multidaily_local.t
+++ b/tests/cyclers/23-multidaily_local.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test intercycle dependencies, local time.
+# Test intercycle dependencies, local time.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/cyclers/24-360_calendar.t b/tests/cyclers/24-360_calendar.t
index a642c7a317d..cb5ba354306 100644
--- a/tests/cyclers/24-360_calendar.t
+++ b/tests/cyclers/24-360_calendar.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test intercycle dependencies.
+# Test intercycle dependencies.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/cycletime/00-time.t b/tests/cycletime/00-time.t
index 1c586ebf7c8..95b7b3aab71 100644
--- a/tests/cycletime/00-time.t
+++ b/tests/cycletime/00-time.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: basic jinja2 expansion test
+# basic jinja2 expansion test
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 27
diff --git a/tests/cycletime/01-iso_timeparser.t b/tests/cycletime/01-iso_timeparser.t
index 810ddf03805..20914d4d1ac 100644
--- a/tests/cycletime/01-iso_timeparser.t
+++ b/tests/cycletime/01-iso_timeparser.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Run the time_parser.py tests
+# Run the time_parser.py tests
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/cylc-cat-state/00-basic.t b/tests/cylc-cat-state/00-basic.t
index 02cb50d0ff8..f23dbd5c31f 100644
--- a/tests/cylc-cat-state/00-basic.t
+++ b/tests/cylc-cat-state/00-basic.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cat-check against suite database
+# Test cat-check against suite database
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 3
diff --git a/tests/cylc-get-config/00-simple.t b/tests/cylc-get-config/00-simple.t
index 1c56ab00126..9f4c461dceb 100644
--- a/tests/cylc-get-config/00-simple.t
+++ b/tests/cylc-get-config/00-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cylc get-config
+# Test cylc get-config
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 14
diff --git a/tests/cylc-get-site-config/00-basic.t b/tests/cylc-get-site-config/00-basic.t
index 236ab63e728..6e0b2f76650 100644
--- a/tests/cylc-get-site-config/00-basic.t
+++ b/tests/cylc-get-site-config/00-basic.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cylc-get-site-config
+# Test cylc-get-site-config
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 9
diff --git a/tests/cylc-ping/00-simple.t b/tests/cylc-ping/00-simple.t
index 4d2b21f15ea..3128b576ce1 100644
--- a/tests/cylc-ping/00-simple.t
+++ b/tests/cylc-ping/00-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cylc ping behaviour
+# Test cylc ping behaviour
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/cylc-poll/00-basic.t b/tests/cylc-poll/00-basic.t
index d0864239c0b..dd4a3575a93 100644
--- a/tests/cylc-poll/00-basic.t
+++ b/tests/cylc-poll/00-basic.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cat-check against suite database
+# Test cat-check against suite database
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/cylc-remove/00-simple.t b/tests/cylc-remove/00-simple.t
index d3403f1965c..e74ea18f7a7 100644
--- a/tests/cylc-remove/00-simple.t
+++ b/tests/cylc-remove/00-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cylc remove
+# Test cylc remove
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/cylc-scan/00-simple.t b/tests/cylc-scan/00-simple.t
index d3eaf87d04b..a6feba2b194 100644
--- a/tests/cylc-scan/00-simple.t
+++ b/tests/cylc-scan/00-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cylc scan is picking up running suite
+# Test cylc scan is picking up running suite
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/database/00-simple.t b/tests/database/00-simple.t
index c63fe384dd9..362dd1b3a5a 100644
--- a/tests/database/00-simple.t
+++ b/tests/database/00-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: basic tests for suite database contents
+# basic tests for suite database contents
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 5
diff --git a/tests/directives/00-loadleveler.t b/tests/directives/00-loadleveler.t
index 5c10d6c4a41..1e20121f8a4 100644
--- a/tests/directives/00-loadleveler.t
+++ b/tests/directives/00-loadleveler.t
@@ -15,9 +15,9 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test loadleveler directives
-#C: This test requires a [directive-tests]loadleveler-host entry in
-#C: site/user config in order to run, otherwise it will be bypassed
+# Test loadleveler directives
+# This test requires a [directive-tests]loadleveler-host entry in
+# site/user config in order to run, otherwise it will be bypassed
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/directives/01-at.t b/tests/directives/01-at.t
index b5bc2b9b139..debb854e6d4 100644
--- a/tests/directives/01-at.t
+++ b/tests/directives/01-at.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test at submission
+# Test at submission
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/documentation/00-make.t b/tests/documentation/00-make.t
index 41a8c5c784c..369d8bfa6b9 100644
--- a/tests/documentation/00-make.t
+++ b/tests/documentation/00-make.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test documentation can be made
+# Test documentation can be made
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/events/00-suite.t b/tests/events/00-suite.t
index 0bdbdaf0742..d5eaf0d0bca 100644
--- a/tests/events/00-suite.t
+++ b/tests/events/00-suite.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Validate and run the events/suite test suite
+# Validate and run the events/suite test suite
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/events/01-task.t b/tests/events/01-task.t
index 00d80ff505f..16e733c428d 100644
--- a/tests/events/01-task.t
+++ b/tests/events/01-task.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Validate and run the task events suite.
+# Validate and run the task events suite.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/graph-equivalence/00-oneline.t b/tests/graph-equivalence/00-oneline.t
index d597c6108bf..73442d839ac 100644
--- a/tests/graph-equivalence/00-oneline.t
+++ b/tests/graph-equivalence/00-oneline.t
@@ -15,9 +15,9 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test graph="a=>b=>c" gives the same result as
-#C: graph = """a => b\
-#C: => c"""
+# Test graph="a=>b=>c" gives the same result as
+# graph = """a => b\
+# => c"""
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 5
diff --git a/tests/graph-equivalence/01-twolines.t b/tests/graph-equivalence/01-twolines.t
index 9c9abda77cc..6768dd250e1 100644
--- a/tests/graph-equivalence/01-twolines.t
+++ b/tests/graph-equivalence/01-twolines.t
@@ -15,9 +15,9 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test graph = """a => b
-#C: b => c""" gives the same result as
-#C: graph = "a => b => c"
+# Test graph = """a => b
+# b => c""" gives the same result as
+# graph = "a => b => c"
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 5
diff --git a/tests/graph-equivalence/02-splitline.t b/tests/graph-equivalence/02-splitline.t
index f53a688113b..8217c4a65e2 100644
--- a/tests/graph-equivalence/02-splitline.t
+++ b/tests/graph-equivalence/02-splitline.t
@@ -15,10 +15,10 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test graph = """a => b\
-#C: => c""" gives the same result as
-#C: graph = """a => b
-#C: b => c"""
+# Test graph = """a => b\
+# => c""" gives the same result as
+# graph = """a => b
+# b => c"""
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 5
diff --git a/tests/graph-equivalence/03-multiline_and1.t b/tests/graph-equivalence/03-multiline_and1.t
index 6f7f1c885df..b83eb7588dd 100644
--- a/tests/graph-equivalence/03-multiline_and1.t
+++ b/tests/graph-equivalence/03-multiline_and1.t
@@ -15,10 +15,10 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test graph = "a & b => c"
-#C: gives the same result as
-#C: graph = """a => c
-#C: b => c"""
+# Test graph = "a & b => c"
+# gives the same result as
+# graph = """a => c
+# b => c"""
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 3
diff --git a/tests/graph-equivalence/04-multiline_and2.t b/tests/graph-equivalence/04-multiline_and2.t
index 8132b93235e..a0c935e1472 100644
--- a/tests/graph-equivalence/04-multiline_and2.t
+++ b/tests/graph-equivalence/04-multiline_and2.t
@@ -15,10 +15,10 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test graph = """a => c
-#C: b => c"""
-#C: gives the same result as
-#C: graph = "a & b => c"
+# Test graph = """a => c
+# b => c"""
+# gives the same result as
+# graph = "a & b => c"
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
diff --git a/tests/host-select/00-simple.t b/tests/host-select/00-simple.t
index c2d1a3b778e..de139f67769 100644
--- a/tests/host-select/00-simple.t
+++ b/tests/host-select/00-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test host selection
+# Test host selection
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/intercycle/00-past.t b/tests/intercycle/00-past.t
index a4c4c32181c..f30bfd58af7 100644
--- a/tests/intercycle/00-past.t
+++ b/tests/intercycle/00-past.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test intercycle dependencies.
+# Test intercycle dependencies.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/intercycle/01-future.t b/tests/intercycle/01-future.t
index feac4368e31..244b0f4a670 100644
--- a/tests/intercycle/01-future.t
+++ b/tests/intercycle/01-future.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test future cycle dependencies.
+# Test future cycle dependencies.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/intercycle/02-asynch.t b/tests/intercycle/02-asynch.t
index 2617f7c9dcd..07f4c5a698e 100644
--- a/tests/intercycle/02-asynch.t
+++ b/tests/intercycle/02-asynch.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test dependencies on an asynch task from cycling tasks.
+# Test dependencies on an asynch task from cycling tasks.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/intercycle/03-complex-implicit.t b/tests/intercycle/03-complex-implicit.t
index 96decbd2205..5f83d735a09 100644
--- a/tests/intercycle/03-complex-implicit.t
+++ b/tests/intercycle/03-complex-implicit.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test future cycle dependencies.
+# Test future cycle dependencies.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/internal-outputs/00-messaging.t b/tests/internal-outputs/00-messaging.t
index faf589a522f..ba7db73b797 100644
--- a/tests/internal-outputs/00-messaging.t
+++ b/tests/internal-outputs/00-messaging.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test messaging in a suite.
+# Test messaging in a suite.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/jinja2/00-simple.t b/tests/jinja2/00-simple.t
index 36d2bcda8f3..2e9375ce2d4 100644
--- a/tests/jinja2/00-simple.t
+++ b/tests/jinja2/00-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: basic jinja2 expansion test
+# basic jinja2 expansion test
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/jinja2/01-include.t b/tests/jinja2/01-include.t
index e194aea8b58..63c56930a29 100644
--- a/tests/jinja2/01-include.t
+++ b/tests/jinja2/01-include.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: basic jinja2 include and expand test
+# basic jinja2 include and expand test
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/jinja2/02-incomplete.t b/tests/jinja2/02-incomplete.t
index cd1b9f0ea60..1aaa1317c61 100644
--- a/tests/jinja2/02-incomplete.t
+++ b/tests/jinja2/02-incomplete.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: jinja2 test for fail to validate when including a file with incomplete loop
+# jinja2 test for fail to validate when including a file with incomplete loop
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/jinja2/03-bad.t b/tests/jinja2/03-bad.t
index 2448506594b..16f43511920 100644
--- a/tests/jinja2/03-bad.t
+++ b/tests/jinja2/03-bad.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: jinja2 test for fail to validate an included file with missing quotes in array
+# jinja2 test for fail to validate an included file with missing quotes in array
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/jinja2/04-missing.t b/tests/jinja2/04-missing.t
index f8228f89e9b..59464ff7cfe 100644
--- a/tests/jinja2/04-missing.t
+++ b/tests/jinja2/04-missing.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: jinja2 test for fail to validate when including a missing file
+# jinja2 test for fail to validate when including a missing file
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/jinja2/05-commandline.t b/tests/jinja2/05-commandline.t
index d5430f333f6..4b76064ac3d 100644
--- a/tests/jinja2/05-commandline.t
+++ b/tests/jinja2/05-commandline.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: jinja2 command line variables test
+# jinja2 command line variables test
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 3
diff --git a/tests/jinja2/06-do-extension.t b/tests/jinja2/06-do-extension.t
index 3836f093ba2..695dcff28bc 100644
--- a/tests/jinja2/06-do-extension.t
+++ b/tests/jinja2/06-do-extension.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: test that the jinja2 do extension is loaded.
+# test that the jinja2 do extension is loaded.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/job-kill/00-local.t b/tests/job-kill/00-local.t
index 24dd22fc382..b9e28f35d01 100755
--- a/tests/job-kill/00-local.t
+++ b/tests/job-kill/00-local.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test kill local jobs.
+# Test kill local jobs.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 6
diff --git a/tests/job-kill/01-remote.t b/tests/job-kill/01-remote.t
index 61f40e649cf..caf7c1c29dd 100755
--- a/tests/job-kill/01-remote.t
+++ b/tests/job-kill/01-remote.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test killing of jobs on a remote host.
+# Test killing of jobs on a remote host.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
export CYLC_TEST_HOST=$(cylc get-global-config -i '[test battery]remote host')
diff --git a/tests/job-kill/02-loadleveler.t b/tests/job-kill/02-loadleveler.t
index e5c4e30fc70..84fca83d219 100755
--- a/tests/job-kill/02-loadleveler.t
+++ b/tests/job-kill/02-loadleveler.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test killing of jobs submitted to loadleveler.
+# Test killing of jobs submitted to loadleveler.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
export CYLC_TEST_HOST=$( \
diff --git a/tests/jobscript/00-torture.t b/tests/jobscript/00-torture.t
index 13f0008a2e8..88389858945 100644
--- a/tests/jobscript/00-torture.t
+++ b/tests/jobscript/00-torture.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: job script torture test and check jobscript is generated correctly
+# job script torture test and check jobscript is generated correctly
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 4
diff --git a/tests/jobscript/01-multi.t b/tests/jobscript/01-multi.t
index 772a24f35d0..8e0b00292dd 100644
--- a/tests/jobscript/01-multi.t
+++ b/tests/jobscript/01-multi.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test jobscipt is being generated right for mult-inheritance cases
+# Test jobscipt is being generated right for mult-inheritance cases
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 22
diff --git a/tests/manual/00-reset-with-deps.t b/tests/manual/00-reset-with-deps.t
index 1bca6336915..3c78615d4cf 100755
--- a/tests/manual/00-reset-with-deps.t
+++ b/tests/manual/00-reset-with-deps.t
@@ -15,8 +15,8 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test reset to waiting for 2 tasks with dependencies t1=>t2
-#C: See https://github.com/cylc/cylc/pull/947
+# Test reset to waiting for 2 tasks with dependencies t1=>t2
+# See https://github.com/cylc/cylc/pull/947
. $(dirname $0)/test_header
poll_while() {
local TIMEOUT=$(($(date +%s) + 120)) # poll for 2 minutes
diff --git a/tests/modes/00-simulation.t b/tests/modes/00-simulation.t
index 57c64419f8b..79c60bc1ff1 100644
--- a/tests/modes/00-simulation.t
+++ b/tests/modes/00-simulation.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test simulation mode
+# Test simulation mode
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/modes/01-dummy.t b/tests/modes/01-dummy.t
index eab8ec2ed16..b1bebd620ed 100644
--- a/tests/modes/01-dummy.t
+++ b/tests/modes/01-dummy.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test dummy mode
+# Test dummy mode
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/pre-initial/00-simple.t b/tests/pre-initial/00-simple.t
index a6988bb4a75..74c6ad53527 100644
--- a/tests/pre-initial/00-simple.t
+++ b/tests/pre-initial/00-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test simple pre initial cycling dependencies removal
+# Test simple pre initial cycling dependencies removal
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/pre-initial/01-basic.t b/tests/pre-initial/01-basic.t
index adf584aa7ad..cdfeed00fa0 100644
--- a/tests/pre-initial/01-basic.t
+++ b/tests/pre-initial/01-basic.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test simplification of basic conditionals in pre-initial cycling
+# Test simplification of basic conditionals in pre-initial cycling
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/pre-initial/02-advanced.t b/tests/pre-initial/02-advanced.t
index d2a4f8f37d0..17396d1c5aa 100644
--- a/tests/pre-initial/02-advanced.t
+++ b/tests/pre-initial/02-advanced.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test nested conditional simplification for pre-initial cycling.
+# Test nested conditional simplification for pre-initial cycling.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/pre-initial/03-drop.t b/tests/pre-initial/03-drop.t
index 48dfc253299..94a76e394c5 100644
--- a/tests/pre-initial/03-drop.t
+++ b/tests/pre-initial/03-drop.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test the case of dropping a conditional based on pre-initial cycling
+# Test the case of dropping a conditional based on pre-initial cycling
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/pre-initial/04-warm.t b/tests/pre-initial/04-warm.t
index c7165c5fb34..d660f762eda 100644
--- a/tests/pre-initial/04-warm.t
+++ b/tests/pre-initial/04-warm.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test pre-initial cycling works under warm starts
+# Test pre-initial cycling works under warm starts
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/pre-initial/05-warm-new-ict.t b/tests/pre-initial/05-warm-new-ict.t
index 476d89ae00f..2518d6ece5d 100644
--- a/tests/pre-initial/05-warm-new-ict.t
+++ b/tests/pre-initial/05-warm-new-ict.t
@@ -15,8 +15,8 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test pre-initial cycling works under warm starts with a new initial cycle
-#C: time that is later than the suite.rc initial cycle time.
+# Test pre-initial cycling works under warm starts with a new initial cycle
+# time that is later than the suite.rc initial cycle time.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/pre-initial/06-over-bracketed.t b/tests/pre-initial/06-over-bracketed.t
index ff773951a3e..7e5ecbbbcd2 100644
--- a/tests/pre-initial/06-over-bracketed.t
+++ b/tests/pre-initial/06-over-bracketed.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test nested conditional simplification for pre-initial cycling.
+# Test nested conditional simplification for pre-initial cycling.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/pre-initial/07-simple-messaging.t b/tests/pre-initial/07-simple-messaging.t
index b72d135665c..26463ec89a0 100644
--- a/tests/pre-initial/07-simple-messaging.t
+++ b/tests/pre-initial/07-simple-messaging.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test removal of pre-initial cycle message dependencies.
+# Test removal of pre-initial cycle message dependencies.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/pre-initial/08-conditional-messaging.t b/tests/pre-initial/08-conditional-messaging.t
index 5d1b4fb7fa1..34e6409f743 100644
--- a/tests/pre-initial/08-conditional-messaging.t
+++ b/tests/pre-initial/08-conditional-messaging.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test removal of pre-initial cycle messages from conditionals.
+# Test removal of pre-initial cycle messages from conditionals.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/purge/00-purge.t b/tests/purge/00-purge.t
index cc3b9a816ae..5b578e93d9f 100644
--- a/tests/purge/00-purge.t
+++ b/tests/purge/00-purge.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cylc purge from a suite
+# Test cylc purge from a suite
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/purge/purge/reference.log b/tests/purge/purge/reference.log
index d5bdf8db47b..ad2c6ec0181 100644
--- a/tests/purge/purge/reference.log
+++ b/tests/purge/purge/reference.log
@@ -108,7 +108,7 @@ F.2010010106 submitted
2014/01/07 17:36:20 INFO - [X.2010010200] -(current:submitted)> X.2010010200 submit_method_id=21265
2014/01/07 17:36:20 INFO - [X.2010010200] -(current:submitted)> X.2010010200 started at 2014-01-07T17:36:20
2014/01/07 17:36:21 INFO - [X.2010010200] -(current:running)> X.2010010200 succeeded at 2014-01-07T17:36:20
-2014/01/07 17:36:22 INFO - [X.2010010206] -triggered off []
+2014/01/07 17:36:22 INFO - [X.2010010206] -triggered off ['prep.2010010106']
2014/01/07 17:36:22 INFO - [recover.2010010112] -(current:ready)> recover.2010010112 submitting now
2014/01/07 17:36:22 INFO - [recover.2010010112] -(current:ready)> recover.2010010112 submission succeeded
2014/01/07 17:36:22 INFO - [recover.2010010112] -(current:submitted)> recover.2010010112 submit_method_id=21338
diff --git a/tests/purge/purge/suite.rc b/tests/purge/purge/suite.rc
index c0d71f9d841..d301be8db34 100644
--- a/tests/purge/purge/suite.rc
+++ b/tests/purge/purge/suite.rc
@@ -1,13 +1,14 @@
-title = "Cylc Admin Test Suite"
+title = "Old Cylc Admin Test Suite"
-# B[T-6]-> B -> E
-# / \
-# X & A[T-6]-> A -> D
-# \ /
-# C[T-6]-> C -> F
-#
+# B[-PT6H]-> B -> E
+# / \
+# X & A[-PT6H]-> A -> D
+# \ /
+# C[-PT6H]-> C -> F
+#
[cylc]
+ cycle point format = %Y%m%d%H # (for old-style reference log)
[[reference test]]
required run mode = live
expected task failures = X.2010010112
@@ -19,25 +20,24 @@ title = "Cylc Admin Test Suite"
initial cycle time = 2010010106
[[special tasks]]
- start-up = prep
- cold-start = ColdA, ColdB, ColdC
- clock-triggered = X(1)
+ cold-start = ColdA, ColdB, ColdC
+ clock-triggered = X(1)
[[dependencies]]
- [[[0,6,12,18]]]
+ [[[R1]]]
+ graph = "prep => X & ColdA & ColdB & ColdC"
+ [[[T00,T06,T12,T18]]]
graph = """
- prep => X & ColdA & ColdB & ColdC
-
- X => A => B => E
+ prep[^] => X => A => B => E
A => C => F
B & C => D
- Warm[T-6]:succeed-all & Post[T-6]:succeed-all & X:fail => recover
+ Warm[-PT6H]:succeed-all & Post[-PT6H]:succeed-all & X:fail => recover
Warm:succeed-all & Post:succeed-all => !recover
-
- ColdA | A[T-6] => A
- ColdB | B[T-6] => B
- ColdC | C[T-6] => C
+
+ ColdA | A[-PT6H] => A
+ ColdB | B[-PT6H] => B
+ ColdC | C[-PT6H] => C
"""
[runtime]
[[root]]
diff --git a/tests/queues/00-queuesize-3.t b/tests/queues/00-queuesize-3.t
index 6bb68d97998..335d72d2beb 100644
--- a/tests/queues/00-queuesize-3.t
+++ b/tests/queues/00-queuesize-3.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test running with a queue with limit=3
+# Test running with a queue with limit=3
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/queues/01-queuesize-5.t b/tests/queues/01-queuesize-5.t
index ce93c74c4f2..268da3d3561 100644
--- a/tests/queues/01-queuesize-5.t
+++ b/tests/queues/01-queuesize-5.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test running with a queue with limit=5
+# Test running with a queue with limit=5
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/00-simple.t b/tests/reload/00-simple.t
index 6ff2697a84f..29cc6d35101 100644
--- a/tests/reload/00-simple.t
+++ b/tests/reload/00-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test reloading a simple suite
+# Test reloading a simple suite
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/01-asynch.t b/tests/reload/01-asynch.t
index c1b4ae376f2..97f79293712 100644
--- a/tests/reload/01-asynch.t
+++ b/tests/reload/01-asynch.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test reloading a suite containing an asynchronous task
+# Test reloading a suite containing an asynchronous task
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/02-cold.t b/tests/reload/02-cold.t
index d8d1a062ca6..1dcb9e65f38 100644
--- a/tests/reload/02-cold.t
+++ b/tests/reload/02-cold.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test reloading a suite containing a cold-start task
+# Test reloading a suite containing a cold-start task
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/03-startup.t b/tests/reload/03-startup.t
index 77cbb422a37..53a5655fe0e 100644
--- a/tests/reload/03-startup.t
+++ b/tests/reload/03-startup.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test reloading a suite containing a startup task.
+# Test reloading a suite containing a startup task.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/04-content.t b/tests/reload/04-content.t
index 2b13c886550..d7b7554cd09 100644
--- a/tests/reload/04-content.t
+++ b/tests/reload/04-content.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test reloads have actually updated environment variables
+# Test reloads have actually updated environment variables
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/05-queues.t b/tests/reload/05-queues.t
index 6526fa4362f..4c6581799fa 100644
--- a/tests/reload/05-queues.t
+++ b/tests/reload/05-queues.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test changing queue size via reload doesn't break anything
+# Test changing queue size via reload doesn't break anything
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/06-inheritance.t b/tests/reload/06-inheritance.t
index bd812f077ad..ba537a81403 100644
--- a/tests/reload/06-inheritance.t
+++ b/tests/reload/06-inheritance.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test changing inheritance via a reload
+# Test changing inheritance via a reload
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/07-graphing-simple.t b/tests/reload/07-graphing-simple.t
index b4e38ef4be2..db6b1c8b867 100644
--- a/tests/reload/07-graphing-simple.t
+++ b/tests/reload/07-graphing-simple.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test changing basic graphing via a reload
+# Test changing basic graphing via a reload
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/08-graphing-fam.t b/tests/reload/08-graphing-fam.t
index 79142d1d6b3..203014e278f 100644
--- a/tests/reload/08-graphing-fam.t
+++ b/tests/reload/08-graphing-fam.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test changing family triggering via a reload
+# Test changing family triggering via a reload
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/09-final-cycle.t b/tests/reload/09-final-cycle.t
index 4f8f3a19b98..2bd01ababd1 100644
--- a/tests/reload/09-final-cycle.t
+++ b/tests/reload/09-final-cycle.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test changing final cycle time
+# Test changing final cycle time
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/10-cycle.t b/tests/reload/10-cycle.t
index d8670342ee2..7058d33cdc1 100644
--- a/tests/reload/10-cycle.t
+++ b/tests/reload/10-cycle.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test changing cycle times (and dependencies)
+# Test changing cycle times (and dependencies)
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/reload/11-garbage.t b/tests/reload/11-garbage.t
index 5bfa1f6cfb7..31dfb9a3a0a 100644
--- a/tests/reload/11-garbage.t
+++ b/tests/reload/11-garbage.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test trying to reload a file with invalid dependencies section header
+# Test trying to reload a file with invalid dependencies section header
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 3
diff --git a/tests/reload/12-runahead.t b/tests/reload/12-runahead.t
index 3fb7fc00630..3f7acb3ef2d 100644
--- a/tests/reload/12-runahead.t
+++ b/tests/reload/12-runahead.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test runahead limit is being correctly reloaded
+# Test runahead limit is being correctly reloaded
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 3
diff --git a/tests/remote/00-basic.t b/tests/remote/00-basic.t
index 2a695a80541..7d8ed507cb1 100644
--- a/tests/remote/00-basic.t
+++ b/tests/remote/00-basic.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test remote host settings.
+# Test remote host settings.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 4
diff --git a/tests/restart/00-pre-initial.t b/tests/restart/00-pre-initial.t
index aa303ab49e6..e033fab0671 100644
--- a/tests/restart/00-pre-initial.t
+++ b/tests/restart/00-pre-initial.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a suite with pre-initial cycle dependencies
+# Test restarting a suite with pre-initial cycle dependencies
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 4
diff --git a/tests/restart/01-broadcast.t b/tests/restart/01-broadcast.t
index 2909f098186..21b241a37cb 100644
--- a/tests/restart/01-broadcast.t
+++ b/tests/restart/01-broadcast.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a simple suite with a broadcast
+# Test restarting a simple suite with a broadcast
if [[ -z ${TEST_DIR:-} ]]; then
. $(dirname $0)/test_header
fi
@@ -136,6 +136,7 @@ ssss.
Begin task states
broadcast_task.2013092306 : status=waiting, spawned=false
force_restart.2013092306 : status=running, spawned=true
+force_restart.2013092312 : status=held, spawned=false
output_states.2013092306 : status=waiting, spawned=false
send_a_broadcast_task.2013092306 : status=succeeded, spawned=true
send_a_broadcast_task.2013092312 : status=held, spawned=false
@@ -147,6 +148,7 @@ broadcast_task|2013092300|1|1|succeeded
broadcast_task|2013092306|0|1|waiting
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|running
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|0|1|waiting
send_a_broadcast_task|2013092300|1|1|succeeded
@@ -161,8 +163,10 @@ broadcast_task|2013092300|1|1|succeeded
broadcast_task|2013092306|0|1|waiting
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
+output_states|2013092312|0|1|held
send_a_broadcast_task|2013092300|1|1|succeeded
send_a_broadcast_task|2013092306|1|1|succeeded
send_a_broadcast_task|2013092312|0|1|held
@@ -189,8 +193,12 @@ S'2013092306'
p9
ssss.
Begin task states
+broadcast_task.2013092312 : status=held, spawned=false
+force_restart.2013092312 : status=held, spawned=false
+output_states.2013092312 : status=held, spawned=false
send_a_broadcast_task.2013092312 : status=held, spawned=false
tidy.2013092306 : status=succeeded, spawned=true
+tidy.2013092312 : status=held, spawned=false
__STATE__
sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
@@ -199,15 +207,19 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
broadcast_task|2013092300|1|1|succeeded
broadcast_task|2013092306|1|1|succeeded
+broadcast_task|2013092312|0|1|held
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
+output_states|2013092312|0|1|held
send_a_broadcast_task|2013092300|1|1|succeeded
send_a_broadcast_task|2013092306|1|1|succeeded
send_a_broadcast_task|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
+tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
diff --git a/tests/restart/02-failed.t b/tests/restart/02-failed.t
index fd92fb36231..78ab89a7df1 100644
--- a/tests/restart/02-failed.t
+++ b/tests/restart/02-failed.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a simple suite with a failed task
+# Test restarting a simple suite with a failed task
if [[ -z ${TEST_DIR:-} ]]; then
. $(dirname $0)/test_header
fi
@@ -95,6 +95,7 @@ Begin task states
failed_task.2013092306 : status=failed, spawned=true
failed_task.2013092312 : status=held, spawned=false
force_restart.2013092306 : status=running, spawned=true
+force_restart.2013092312 : status=held, spawned=false
output_states.2013092306 : status=waiting, spawned=false
tidy.2013092300 : status=succeeded, spawned=true
tidy.2013092306 : status=waiting, spawned=false
@@ -116,8 +117,10 @@ failed_task|2013092306|1|1|failed
failed_task|2013092312|0|1|held
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
+output_states|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|0|1|waiting
__DB_DUMP__
@@ -129,7 +132,10 @@ final cycle : 2013092306
.
Begin task states
failed_task.2013092312 : status=held, spawned=false
+force_restart.2013092312 : status=held, spawned=false
+output_states.2013092312 : status=held, spawned=false
tidy.2013092306 : status=succeeded, spawned=true
+tidy.2013092312 : status=held, spawned=false
__STATE__
sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
@@ -141,10 +147,13 @@ failed_task|2013092306|1|1|failed
failed_task|2013092312|0|1|held
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
+output_states|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
+tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
diff --git a/tests/restart/03-retrying.t b/tests/restart/03-retrying.t
index 61c3e0388f8..b4c50b31bf3 100644
--- a/tests/restart/03-retrying.t
+++ b/tests/restart/03-retrying.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a simple suite with a retrying task
+# Test restarting a simple suite with a retrying task
if [[ -z ${TEST_DIR:-} ]]; then
. $(dirname $0)/test_header
fi
@@ -103,6 +103,7 @@ final cycle : 2013092306
.
Begin task states
force_restart.2013092306 : status=running, spawned=true
+force_restart.2013092312 : status=held, spawned=false
output_states.2013092306 : status=waiting, spawned=false
retrying_task.2013092306 : status=retrying, spawned=true
retrying_task.2013092312 : status=held, spawned=false
@@ -112,6 +113,7 @@ __STATE__
cmp_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|running
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|0|1|waiting
retrying_task|2013092300|4|3|succeeded
@@ -123,8 +125,10 @@ __DB_DUMP__
cmp_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
+output_states|2013092312|0|1|held
retrying_task|2013092300|4|3|succeeded
retrying_task|2013092306|2|2|retrying
retrying_task|2013092312|0|1|held
@@ -138,8 +142,11 @@ final cycle : 2013092306
(dp1
.
Begin task states
+force_restart.2013092312 : status=held, spawned=false
+output_states.2013092312 : status=held, spawned=false
retrying_task.2013092312 : status=held, spawned=false
tidy.2013092306 : status=succeeded, spawned=true
+tidy.2013092312 : status=held, spawned=false
__STATE__
sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
@@ -148,13 +155,16 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
+output_states|2013092312|0|1|held
retrying_task|2013092300|4|3|succeeded
retrying_task|2013092306|4|3|succeeded
retrying_task|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
+tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
diff --git a/tests/restart/04-running.t b/tests/restart/04-running.t
index 70366c48cfd..abcbfc9c3ed 100644
--- a/tests/restart/04-running.t
+++ b/tests/restart/04-running.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a simple suite with a running task
+# Test restarting a simple suite with a running task
if [[ -z ${TEST_DIR:-} ]]; then
. $(dirname $0)/test_header
fi
@@ -93,6 +93,7 @@ final cycle : 2013092306
.
Begin task states
force_restart.2013092306 : status=running, spawned=true
+force_restart.2013092312 : status=held, spawned=false
output_states.2013092306 : status=waiting, spawned=false
running_task.2013092306 : status=running, spawned=true
running_task.2013092312 : status=held, spawned=false
@@ -114,8 +115,10 @@ __DB_DUMP__
cmp_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
+output_states|2013092312|0|1|held
running_task|2013092300|1|1|succeeded
running_task|2013092306|1|1|succeeded
running_task|2013092312|0|1|held
@@ -129,8 +132,11 @@ final cycle : 2013092306
(dp1
.
Begin task states
+force_restart.2013092312 : status=held, spawned=false
+output_states.2013092312 : status=held, spawned=false
running_task.2013092312 : status=held, spawned=false
tidy.2013092306 : status=succeeded, spawned=true
+tidy.2013092312 : status=held, spawned=false
__STATE__
sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
@@ -139,13 +145,16 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
+output_states|2013092312|0|1|held
running_task|2013092300|1|1|succeeded
running_task|2013092306|1|1|succeeded
running_task|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
+tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
diff --git a/tests/restart/05-submit-failed.t b/tests/restart/05-submit-failed.t
index 08e18f6163f..25f0493961a 100644
--- a/tests/restart/05-submit-failed.t
+++ b/tests/restart/05-submit-failed.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a simple suite with a submit-failed task
+# Test restarting a simple suite with a submit-failed task
if [[ -z ${TEST_DIR:-} ]]; then
. $(dirname $0)/test_header
fi
@@ -91,6 +91,7 @@ final cycle : 2013092306
.
Begin task states
force_restart.2013092306 : status=running, spawned=true
+force_restart.2013092312 : status=held, spawned=false
output_states.2013092306 : status=waiting, spawned=false
submit_fail_task.2013092306 : status=submit-failed, spawned=false
tidy.2013092300 : status=succeeded, spawned=true
@@ -110,8 +111,10 @@ __DB_DUMP__
cmp_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
+output_states|2013092312|0|1|held
submit_fail_task|2013092300|1|1|submit-failed
submit_fail_task|2013092306|1|1|submit-failed
tidy|2013092300|1|1|succeeded
@@ -124,8 +127,11 @@ final cycle : 2013092306
(dp1
.
Begin task states
+force_restart.2013092312 : status=held, spawned=false
+output_states.2013092312 : status=held, spawned=false
submit_fail_task.2013092312 : status=held, spawned=false
tidy.2013092306 : status=succeeded, spawned=true
+tidy.2013092312 : status=held, spawned=false
__STATE__
sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
@@ -134,13 +140,16 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
+output_states|2013092312|0|1|held
submit_fail_task|2013092300|1|1|submit-failed
submit_fail_task|2013092306|1|1|submit-failed
submit_fail_task|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
+tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
diff --git a/tests/restart/06-succeeded.t b/tests/restart/06-succeeded.t
index eaa53e9be45..63a96264a6b 100644
--- a/tests/restart/06-succeeded.t
+++ b/tests/restart/06-succeeded.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a simple suite with a succeeded task
+# Test restarting a simple suite with a succeeded task
if [[ -z ${TEST_DIR:-} ]]; then
. $(dirname $0)/test_header
fi
@@ -93,6 +93,7 @@ final cycle : 2013092306
.
Begin task states
force_restart.2013092306 : status=running, spawned=true
+force_restart.2013092312 : status=held, spawned=false
output_states.2013092306 : status=waiting, spawned=false
succeed_task.2013092306 : status=succeeded, spawned=true
succeed_task.2013092312 : status=held, spawned=false
@@ -114,8 +115,10 @@ __DB_DUMP__
cmp_ok $TEST_DIR/states-db-post-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
+output_states|2013092312|0|1|held
succeed_task|2013092300|1|1|succeeded
succeed_task|2013092306|1|1|succeeded
succeed_task|2013092312|0|1|held
@@ -129,8 +132,11 @@ final cycle : 2013092306
(dp1
.
Begin task states
+force_restart.2013092312 : status=held, spawned=false
+output_states.2013092312 : status=held, spawned=false
succeed_task.2013092312 : status=held, spawned=false
tidy.2013092306 : status=succeeded, spawned=true
+tidy.2013092312 : status=held, spawned=false
__STATE__
sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
@@ -139,13 +145,16 @@ sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
cmp_ok $TEST_DIR/states-db <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|succeeded
+force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
+output_states|2013092312|0|1|held
succeed_task|2013092300|1|1|succeeded
succeed_task|2013092306|1|1|succeeded
succeed_task|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
+tidy|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
diff --git a/tests/restart/07-waiting.t b/tests/restart/07-waiting.t
index 26360da13fc..e176a9d33c4 100644
--- a/tests/restart/07-waiting.t
+++ b/tests/restart/07-waiting.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a simple suite with a waiting task
+# Test restarting a simple suite with a waiting task
if [[ -z ${TEST_DIR:-} ]]; then
. $(dirname $0)/test_header
fi
@@ -100,7 +100,6 @@ __STATE__
cmp_ok $TEST_DIR/states-db-pre-restart-2013092306 <<'__DB_DUMP__'
force_restart|2013092300|1|1|succeeded
force_restart|2013092306|1|1|running
-force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|0|1|waiting
tidy|2013092300|1|1|succeeded
@@ -114,6 +113,7 @@ force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|running
+output_states|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|0|1|waiting
waiting_task|2013092300|1|1|succeeded
@@ -127,7 +127,10 @@ final cycle : 2013092306
.
Begin task states
force_restart.2013092312 : status=held, spawned=false
+output_states.2013092312 : status=held, spawned=false
tidy.2013092306 : status=succeeded, spawned=true
+tidy.2013092312 : status=held, spawned=false
+waiting_task.2013092312 : status=held, spawned=false
__STATE__
sqlite3 $(cylc get-global-config --print-run-dir)/$SUITE_NAME/cylc-suite.db \
"select name, cycle, submit_num, try_num, status
@@ -139,10 +142,13 @@ force_restart|2013092306|1|1|succeeded
force_restart|2013092312|0|1|held
output_states|2013092300|1|1|succeeded
output_states|2013092306|1|1|succeeded
+output_states|2013092312|0|1|held
tidy|2013092300|1|1|succeeded
tidy|2013092306|1|1|succeeded
+tidy|2013092312|0|1|held
waiting_task|2013092300|1|1|succeeded
waiting_task|2013092306|1|1|succeeded
+waiting_task|2013092312|0|1|held
__DB_DUMP__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
diff --git a/tests/restart/08-retrying-ll.t b/tests/restart/08-retrying-ll.t
index 5a239bb287e..4f6b554524f 100644
--- a/tests/restart/08-retrying-ll.t
+++ b/tests/restart/08-retrying-ll.t
@@ -15,9 +15,9 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a simple suite using loadleveler with a retrying task
-#C: This test requires a [directive-tests]loadleveler-host entry in
-#C: site/user config in order to run, otherwise it will be bypassed
+# Test restarting a simple suite using loadleveler with a retrying task
+# This test requires a [directive-tests]loadleveler-host entry in
+# site/user config in order to run, otherwise it will be bypassed
#-------------------------------------------------------------------------------
TEST_BASE_PATH=$(cd $(dirname $0) && pwd)/03-retrying.t
. $(dirname $0)/test_header
diff --git a/tests/restart/09-running-ll.t b/tests/restart/09-running-ll.t
index 382e879db9a..148d7d82263 100644
--- a/tests/restart/09-running-ll.t
+++ b/tests/restart/09-running-ll.t
@@ -15,9 +15,9 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a simple suite using loadleveler with a running task
-#C: This test requires a [directive-tests]loadleveler-host entry in
-#C: site/user config in order to run, otherwise it will be bypassed
+# Test restarting a simple suite using loadleveler with a running task
+# This test requires a [directive-tests]loadleveler-host entry in
+# site/user config in order to run, otherwise it will be bypassed
#-------------------------------------------------------------------------------
TEST_BASE_PATH=$(cd $(dirname $0) && pwd)/04-running.t
. $(dirname $0)/test_header
diff --git a/tests/restart/10-submit-failed-ll.t b/tests/restart/10-submit-failed-ll.t
index 6df6b04ca7b..55482e101a4 100644
--- a/tests/restart/10-submit-failed-ll.t
+++ b/tests/restart/10-submit-failed-ll.t
@@ -15,9 +15,9 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting a simple suite using loadleveler with a submit-failed task
-#C: This test requires a [directive-tests]loadleveler-host entry in
-#C: site/user config in order to run, otherwise it will be bypassed
+# Test restarting a simple suite using loadleveler with a submit-failed task
+# This test requires a [directive-tests]loadleveler-host entry in
+# site/user config in order to run, otherwise it will be bypassed
#-------------------------------------------------------------------------------
TEST_BASE_PATH=$(cd $(dirname $0) && pwd)/05-submit-failed.t
. $(dirname $0)/test_header
diff --git a/tests/restart/11-bad-state-dump.t b/tests/restart/11-bad-state-dump.t
index e9a548a00f1..5ad8791e9a5 100644
--- a/tests/restart/11-bad-state-dump.t
+++ b/tests/restart/11-bad-state-dump.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test restarting for suites that have bad state dump files.
+# Test restarting for suites that have bad state dump files.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 15
diff --git a/tests/restart/pre-init/ref-state b/tests/restart/pre-init/ref-state
index 2c8109f6407..bc13cf30d17 100644
--- a/tests/restart/pre-init/ref-state
+++ b/tests/restart/pre-init/ref-state
@@ -1,4 +1,5 @@
bar|2010080800|succeeded
+bar|2010080900|held
foo|2010080800|succeeded
foo|2010080900|held
p1|2010080800|succeeded
diff --git a/tests/retries/00-execution-retry.t b/tests/retries/00-execution-retry.t
index 09942c3e5e6..a9f6ba4050e 100644
--- a/tests/retries/00-execution-retry.t
+++ b/tests/retries/00-execution-retry.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test execution retries are working
+# Test execution retries are working
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 3
diff --git a/tests/retries/03-submission-retry-iso.t b/tests/retries/03-submission-retry-iso.t
index 6d26dd0e7a6..cb428ecb2f6 100644
--- a/tests/retries/03-submission-retry-iso.t
+++ b/tests/retries/03-submission-retry-iso.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test execution retries are working
+# Test execution retries are working
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 3
diff --git a/tests/runahead/00-runahead.t b/tests/runahead/00-runahead.t
index 49be8d2563d..67b7d901200 100644
--- a/tests/runahead/00-runahead.t
+++ b/tests/runahead/00-runahead.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test runahead limit is being enforced
+# Test runahead limit is being enforced
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 4
diff --git a/tests/runahead/01-check-default.t b/tests/runahead/01-check-default.t
index 27571bdc943..c13b1e71360 100644
--- a/tests/runahead/01-check-default.t
+++ b/tests/runahead/01-check-default.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test default runahead limit behaviour is still the same
+# Test default runahead limit behaviour is still the same
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 4
diff --git a/tests/runahead/02-no-final-cycle.t b/tests/runahead/02-no-final-cycle.t
index e0ed68d268f..3fd102e92a7 100644
--- a/tests/runahead/02-no-final-cycle.t
+++ b/tests/runahead/02-no-final-cycle.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test runahead limit is being enforced and doesn't break with no final cycle
+# Test runahead limit is being enforced and doesn't break with no final cycle
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 3
diff --git a/tests/shutdown/00-cycle.t b/tests/shutdown/00-cycle.t
index 016328b53c9..59607606388 100644
--- a/tests/shutdown/00-cycle.t
+++ b/tests/shutdown/00-cycle.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test shutdown after a particular cycle.
+# Test shutdown after a particular cycle.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/shutdown/01-task.t b/tests/shutdown/01-task.t
index 651b809a1fc..a214c3ebafd 100644
--- a/tests/shutdown/01-task.t
+++ b/tests/shutdown/01-task.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test shutdown after a specific task.
+# Test shutdown after a specific task.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/shutdown/02-no_dir.t b/tests/shutdown/02-no_dir.t
index 86a763c614b..fcfdacc7cf3 100644
--- a/tests/shutdown/02-no_dir.t
+++ b/tests/shutdown/02-no_dir.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test suite can shutdown successfully if its run dir is deleted
+# Test suite can shutdown successfully if its run dir is deleted
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/shutdown/03-bad-cycle.t b/tests/shutdown/03-bad-cycle.t
index ec09d03dc6c..b4ddab0c806 100755
--- a/tests/shutdown/03-bad-cycle.t
+++ b/tests/shutdown/03-bad-cycle.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test clean up of port file, on bad start with invalid initial cycle time.
+# Test clean up of port file, on bad start with invalid initial cycle time.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/special/00-sequential.t b/tests/special/00-sequential.t
index 36efa5ec23f..d927a9da560 100644
--- a/tests/special/00-sequential.t
+++ b/tests/special/00-sequential.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test sequential tasks
+# Test sequential tasks
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/special/01-one-off.t b/tests/special/01-one-off.t
index af2b61864db..4f8240de543 100644
--- a/tests/special/01-one-off.t
+++ b/tests/special/01-one-off.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test one-off tasks
+# Test one-off tasks
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 3
diff --git a/tests/special/02-exclude.t b/tests/special/02-exclude.t
index 3964b954791..3c743e01c16 100644
--- a/tests/special/02-exclude.t
+++ b/tests/special/02-exclude.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test exclude at start-up is working
+# Test exclude at start-up is working
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/special/03-include.t b/tests/special/03-include.t
index e8c8c89cf50..40f107ab8e4 100644
--- a/tests/special/03-include.t
+++ b/tests/special/03-include.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test include at start-up is working
+# Test include at start-up is working
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/special/04-clock-triggered.t b/tests/special/04-clock-triggered.t
index f024e923280..b6db6a43c94 100644
--- a/tests/special/04-clock-triggered.t
+++ b/tests/special/04-clock-triggered.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test clock triggering is working
+# Test clock triggering is working
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 4
diff --git a/tests/special/05-clock-triggered-utc.t b/tests/special/05-clock-triggered-utc.t
index ec0724371e2..584d0729d64 100644
--- a/tests/special/05-clock-triggered-utc.t
+++ b/tests/special/05-clock-triggered-utc.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test clock triggering is working
+# Test clock triggering is working
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 4
diff --git a/tests/special/06-clock-triggered-iso.t b/tests/special/06-clock-triggered-iso.t
index 68329e18257..0094fcf62f8 100644
--- a/tests/special/06-clock-triggered-iso.t
+++ b/tests/special/06-clock-triggered-iso.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test clock triggering is working
+# Test clock triggering is working
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 4
diff --git a/tests/startup/00-cold.t b/tests/startup/00-cold.t
index ae15ae1e172..9194af9f3a0 100644
--- a/tests/startup/00-cold.t
+++ b/tests/startup/00-cold.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test cold starting, including that the cold start task has actually run
+# Test cold starting, including that the cold start task has actually run
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/startup/01-warm.t b/tests/startup/01-warm.t
index 39f75a93fbe..2f40b393c12 100644
--- a/tests/startup/01-warm.t
+++ b/tests/startup/01-warm.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test warm starting setting cold-start tasks to succeeded & not running them
+# Test warm starting setting cold-start tasks to succeeded & not running them
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/state-dump/00-basic.t b/tests/state-dump/00-basic.t
index c06f6f6fe1f..862ce5ddaab 100755
--- a/tests/state-dump/00-basic.t
+++ b/tests/state-dump/00-basic.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Basic test for state dumps.
+# Basic test for state dumps.
run_restart() {
suite_run_ok $TEST_NAME cylc restart --reference-test --debug $SUITE_NAME
}
diff --git a/tests/state-dump/01-restart-file.t b/tests/state-dump/01-restart-file.t
index 9f60f4601eb..97e50b74046 100755
--- a/tests/state-dump/01-restart-file.t
+++ b/tests/state-dump/01-restart-file.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Basic test for state dumps, specify the dump on restart command line.
+# Basic test for state dumps, specify the dump on restart command line.
run_restart() {
rm $SUITE_DIR/state/state
suite_run_ok $TEST_NAME cylc restart --reference-test --debug $SUITE_NAME \
diff --git a/tests/state-dump/02-bad-pwd-state.t b/tests/state-dump/02-bad-pwd-state.t
index 380ba0e3ad4..a2e00cbcc4a 100755
--- a/tests/state-dump/02-bad-pwd-state.t
+++ b/tests/state-dump/02-bad-pwd-state.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Basic test for state dumps restart, bogus state file in $PWD.
+# Basic test for state dumps restart, bogus state file in $PWD.
run_restart() {
touch state
suite_run_ok $TEST_NAME cylc restart --reference-test --debug $SUITE_NAME
diff --git a/tests/triggering/00-recovery.t b/tests/triggering/00-recovery.t
index 4cc5706b641..2733b92f769 100644
--- a/tests/triggering/00-recovery.t
+++ b/tests/triggering/00-recovery.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test automated failure recovery example
+# Test automated failure recovery example
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/01-or-conditional.t b/tests/triggering/01-or-conditional.t
index 9ae58443384..7964c34eb0b 100644
--- a/tests/triggering/01-or-conditional.t
+++ b/tests/triggering/01-or-conditional.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test "or" conditionals
+# Test "or" conditionals
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/02-fam-start-all.t b/tests/triggering/02-fam-start-all.t
index 9a95c970b68..f65804eb11d 100644
--- a/tests/triggering/02-fam-start-all.t
+++ b/tests/triggering/02-fam-start-all.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test correct expansion of FAM:start-all
+# Test correct expansion of FAM:start-all
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/03-fam-succeed-all.t b/tests/triggering/03-fam-succeed-all.t
index c44ec9b0a00..340e3986dec 100644
--- a/tests/triggering/03-fam-succeed-all.t
+++ b/tests/triggering/03-fam-succeed-all.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test correct expansion of FAM:succeed-all
+# Test correct expansion of FAM:succeed-all
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/04-fam-fail-all.t b/tests/triggering/04-fam-fail-all.t
index 7b02f4333db..75b1bd13ca9 100644
--- a/tests/triggering/04-fam-fail-all.t
+++ b/tests/triggering/04-fam-fail-all.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test correct expansion of FAM:fail-all
+# Test correct expansion of FAM:fail-all
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/05-fam-finish-all.t b/tests/triggering/05-fam-finish-all.t
index 4dbddbf6462..62a61f4f4a0 100644
--- a/tests/triggering/05-fam-finish-all.t
+++ b/tests/triggering/05-fam-finish-all.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test correct expansion of FAM:finish-all
+# Test correct expansion of FAM:finish-all
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/06-fam-succeed-any.t b/tests/triggering/06-fam-succeed-any.t
index 62d9e6d78a3..78aa85e445a 100644
--- a/tests/triggering/06-fam-succeed-any.t
+++ b/tests/triggering/06-fam-succeed-any.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test correct expansion of FAM:succeed-any
+# Test correct expansion of FAM:succeed-any
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/07-fam-fail-any.t b/tests/triggering/07-fam-fail-any.t
index e611cecd2e9..001b2bc5e74 100644
--- a/tests/triggering/07-fam-fail-any.t
+++ b/tests/triggering/07-fam-fail-any.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test correct expansion of FAM:fail-any
+# Test correct expansion of FAM:fail-any
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/08-fam-finish-any.t b/tests/triggering/08-fam-finish-any.t
index 33711c23c8d..5dc8799258a 100644
--- a/tests/triggering/08-fam-finish-any.t
+++ b/tests/triggering/08-fam-finish-any.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test correct expansion of FAM:finish-any
+# Test correct expansion of FAM:finish-any
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/09-fail.t b/tests/triggering/09-fail.t
index 19061d84f88..1f952051150 100644
--- a/tests/triggering/09-fail.t
+++ b/tests/triggering/09-fail.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test fail triggering
+# Test fail triggering
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/10-finish.t b/tests/triggering/10-finish.t
index 7a93c1ebdc6..8a2cc903d03 100644
--- a/tests/triggering/10-finish.t
+++ b/tests/triggering/10-finish.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test finish triggering
+# Test finish triggering
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/11-start.t b/tests/triggering/11-start.t
index b23f0555e7c..3b636e9ae86 100644
--- a/tests/triggering/11-start.t
+++ b/tests/triggering/11-start.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test start triggering
+# Test start triggering
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/12-succeed.t b/tests/triggering/12-succeed.t
index 28646c88f87..84ba220a9de 100644
--- a/tests/triggering/12-succeed.t
+++ b/tests/triggering/12-succeed.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test succeed triggering
+# Test succeed triggering
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/13-submit.t b/tests/triggering/13-submit.t
index 46e6213807b..6e801dd27fa 100644
--- a/tests/triggering/13-submit.t
+++ b/tests/triggering/13-submit.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test submit triggering
+# Test submit triggering
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/triggering/14-submit-fail.t b/tests/triggering/14-submit-fail.t
index 84d9325cace..d1000417763 100644
--- a/tests/triggering/14-submit-fail.t
+++ b/tests/triggering/14-submit-fail.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test submit-fail triggering
+# Test submit-fail triggering
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2
diff --git a/tests/vacation/00-sigusr1.t b/tests/vacation/00-sigusr1.t
index 8892a7a08c7..26f67f1b65b 100755
--- a/tests/vacation/00-sigusr1.t
+++ b/tests/vacation/00-sigusr1.t
@@ -15,9 +15,9 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test handle of SIGUSR1. (Handle a mock job vacation.)
-#C: Obviously, job vacation does not happen with background job, and the job
-#C: will no longer be poll-able after the kill.
+# Test handle of SIGUSR1. (Handle a mock job vacation.)
+# Obviously, job vacation does not happen with background job, and the job
+# will no longer be poll-able after the kill.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 8
diff --git a/tests/vacation/01-loadleveler.t b/tests/vacation/01-loadleveler.t
index 16a9f318270..75b054cfb8e 100755
--- a/tests/vacation/01-loadleveler.t
+++ b/tests/vacation/01-loadleveler.t
@@ -15,10 +15,10 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test whether job vacation trap is included in a loadleveler job or not.
-#C: A job for a task with the restart=yes directive will have the trap.
-#C: This does not test loadleveler job vacation itself, because the test will
-#C: require a site admin to pre-empt a job.
+# Test whether job vacation trap is included in a loadleveler job or not.
+# A job for a task with the restart=yes directive will have the trap.
+# This does not test loadleveler job vacation itself, because the test will
+# require a site admin to pre-empt a job.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
export CYLC_TEST_HOST=$( \
diff --git a/tests/validate/00-multi.t b/tests/validate/00-multi.t
index 584c8e6aa60..4ee7b73f550 100755
--- a/tests/validate/00-multi.t
+++ b/tests/validate/00-multi.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test validating simple multi-inheritance suites.
+# Test validating simple multi-inheritance suites.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/validate/01-periodical.t b/tests/validate/01-periodical.t
index a36aaf33b13..046fe4d389e 100755
--- a/tests/validate/01-periodical.t
+++ b/tests/validate/01-periodical.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test validating Daily, Monthly and Yearly type tasks.
+# Test validating Daily, Monthly and Yearly type tasks.
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/validate/02-scripting-quotes.t b/tests/validate/02-scripting-quotes.t
index d452aae9cba..9231723b983 100755
--- a/tests/validate/02-scripting-quotes.t
+++ b/tests/validate/02-scripting-quotes.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test that validating: command scripting = "foo"bar"baz" fails
+# Test that validating: command scripting = "foo"bar"baz" fails
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/validate/03-incomplete-quotes.t b/tests/validate/03-incomplete-quotes.t
index 525ba10ac8c..b5c8f0fee71 100755
--- a/tests/validate/03-incomplete-quotes.t
+++ b/tests/validate/03-incomplete-quotes.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test validating: command scripting = "foo fails
+# Test validating: command scripting = "foo fails
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/validate/05-strict-case.t b/tests/validate/05-strict-case.t
index 0c96a900385..aeb418a3b1b 100755
--- a/tests/validate/05-strict-case.t
+++ b/tests/validate/05-strict-case.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test strict validation of suite with case mismatches in task names
+# Test strict validation of suite with case mismatches in task names
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/validate/06-strict-missing.t b/tests/validate/06-strict-missing.t
index efa2c352c80..a13356211af 100755
--- a/tests/validate/06-strict-missing.t
+++ b/tests/validate/06-strict-missing.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test strict validation of suite for tasks without runtime entries
+# Test strict validation of suite for tasks without runtime entries
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 1
diff --git a/tests/validate/07-null-parentage.t b/tests/validate/07-null-parentage.t
index 438b0101b32..9d46d6416a8 100755
--- a/tests/validate/07-null-parentage.t
+++ b/tests/validate/07-null-parentage.t
@@ -15,7 +15,7 @@
#C: You should have received a copy of the GNU General Public License
#C: along with this program. If not, see .
#-------------------------------------------------------------------------------
-#C: Test strict validation of suite for tasks with inherit = None
+# Test strict validation of suite for tasks with inherit = None
. $(dirname $0)/test_header
#-------------------------------------------------------------------------------
set_test_number 2