From afda806104e690e86529849d1f074e0b1c24198e Mon Sep 17 00:00:00 2001 From: Ben Fitzpatrick Date: Mon, 21 Jul 2014 10:10:02 +0100 Subject: [PATCH 1/6] #1008: more minimal start-up dependencies --- lib/cylc/config.py | 87 +++++++++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 32 deletions(-) diff --git a/lib/cylc/config.py b/lib/cylc/config.py index b30bc57eeb6..1fe43600798 100644 --- a/lib/cylc/config.py +++ b/lib/cylc/config.py @@ -1543,7 +1543,7 @@ def load_graph( self ): print "Parsing the dependency graph" start_up_tasks = self.cfg['scheduling']['special tasks']['start-up'] - initial_tasks = list(start_up_tasks) + back_comp_initial_tasks = list(start_up_tasks) self.graph_found = False has_non_async_graphs = False @@ -1560,9 +1560,9 @@ def load_graph( self ): ) for left, left_output, right in async_dependencies: if left: - initial_tasks.append(left) + back_comp_initial_tasks.append(left) if right: - initial_tasks.append(right) + back_comp_initial_tasks.append(right) # Create a stack of sections (sequence strings) and graphs. items = [] @@ -1570,18 +1570,20 @@ def load_graph( self ): if item == 'graph': continue has_non_async_graphs = True - items.append((item, value, initial_tasks, False)) + items.append((item, value, back_comp_initial_tasks)) - start_up_tasks_graphed = [] + back_comp_initial_dep_points = {} + initial_point = get_point( + self.cfg['scheduling']['initial cycle point']) + back_comp_initial_tasks_graphed = [] while items: - item, value, tasks_to_prune, is_inserted = items.pop(0) + item, value, tasks_to_prune = items.pop(0) # If the section consists of more than one sequence, split it up. if re.search("(?![^(]+\)),", item): new_items = re.split("(?![^(]+\)),", item) for new_item in new_items: - items.append((new_item.strip(), value, - tasks_to_prune, False)) + items.append((new_item.strip(), value, tasks_to_prune)) continue try: @@ -1592,10 +1594,6 @@ def load_graph( self ): continue section = item - if is_inserted: - print "INSERTED DEPENDENCIES REPLACEMENT:" - print "[[[" + section + "]]]" - print " " + 'graph = """' + graph + '"""' special_dependencies = self.parse_graph( section, graph, section_seq_map=section_seq_map, tasks_to_prune=tasks_to_prune @@ -1606,32 +1604,57 @@ def load_graph( self ): self.cfg['scheduling']['initial cycle point'], self.cfg['scheduling']['final cycle point'] ) - first_point = section_seq.get_first_point( - get_point(self.cfg['scheduling']['initial cycle point']) - ) - graph_text = "" - for left, left_output, right in special_dependencies: - # Set e.g. (foo, fail, bar) to be foo[^]:fail => bar. - graph_text += left + "[^]" - if left_output: - graph_text += ":" + left_output - graph_text += " => " + right + "\n" - if (left in start_up_tasks and - left not in start_up_tasks_graphed): - # Start-up tasks need their own explicit section. - items.append((get_sequence_cls().get_async_expr(), - {"graph": left}, [], True)) - start_up_tasks_graphed.append(left) - graph_text = graph_text.rstrip() - section = get_sequence_cls().get_async_expr(first_point) - items.append((section, {"graph": graph_text}, [], True)) + first_point = section_seq.get_first_point(initial_point) + for dep in special_dependencies: + # Set e.g. (foo, fail, bar) => foo, foo[^]:fail => bar. + left, left_output, right = dep + if left in back_comp_initial_tasks: + # Start-up/Async tasks now always run at R1. + back_comp_initial_dep_points[(left, None, None)] = [ + initial_point] + # Sort out the dependencies on R1 at R1/some-time. + back_comp_initial_dep_points.setdefault(tuple(dep), []) + back_comp_initial_dep_points[tuple(dep)].append( + first_point) + + back_comp_initial_section_graphs = {} + for dep in sorted(back_comp_initial_dep_points): + first_common_point = min(back_comp_initial_dep_points[dep]) + at_initial_point = (first_common_point == initial_point) + left, left_output, right = dep + graph_text = left + if not at_initial_point: + # Reference left at the initial point. + graph_text += "[^]" + if left_output: + graph_text += ":" + left_output + if right: + graph_text += " => " + right + if at_initial_point: + section = get_sequence_cls().get_async_expr() + else: + section = get_sequence_cls().get_async_expr( + first_common_point) + back_comp_initial_section_graphs.setdefault(section, []) + back_comp_initial_section_graphs[section].append(graph_text) + + for section in sorted(back_comp_initial_section_graphs): + total_graph_text = "\n".join( + back_comp_initial_section_graphs[section]) + print "INSERTED DEPENDENCIES REPLACEMENT:" + print "[[[" + section + "]]]" + print " " + 'graph = """\n' + total_graph_text + '\n"""' + self.parse_graph( + section, total_graph_text, + section_seq_map=section_seq_map, tasks_to_prune=[] + ) if not flags.back_comp_cycling: if async_graph and has_non_async_graphs: raise SuiteConfigError( "Error: mixed async & cycling graphs is not allowed in " + "new-style cycling. Use 'R1...' tasks instead." ) - if start_up_tasks: + if back_comp_initial_tasks: raise SuiteConfigError( "Error: start-up tasks should be 'R1...' tasks in " + "new-style cycling" From 339accb429b9f9d21953bb085d81b4d777fb789a Mon Sep 17 00:00:00 2001 From: Ben Fitzpatrick Date: Thu, 24 Jul 2014 12:51:47 +0100 Subject: [PATCH 2/6] #1008: add graphing tests --- bin/cylc-graph | 25 ++++++++++++++++++- lib/cylc/config.py | 1 + lib/cylc/cylc_xdot.py | 6 +++-- tests/cyclers/00-daily.t | 6 +++-- tests/cyclers/360/graph.plain.ref | 9 +++++++ tests/cyclers/360/suite.rc | 3 +++ .../graph.plain.ref | 11 ++++++++ .../r1_multi_start_back_comp_async/suite.rc | 3 +++ .../graph.plain.ref | 11 ++++++++ .../suite.rc | 3 +++ tests/lib/bash/test_header | 11 ++++++++ 11 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 tests/cyclers/360/graph.plain.ref create mode 100644 tests/cyclers/r1_multi_start_back_comp_async/graph.plain.ref create mode 100644 tests/cyclers/r1_multi_start_back_comp_start_up/graph.plain.ref diff --git a/bin/cylc-graph b/bin/cylc-graph index 3c6004086f2..adbfcf14c16 100755 --- a/bin/cylc-graph +++ b/bin/cylc-graph @@ -94,6 +94,9 @@ The "Save" button generates an image of the current view, of format (e.g. png, svg, jpg, eps) determined by the filename extension. If the chosen format is not available a dialog box will show those that are available. +If an output filename is specified in the options, the viewer will not +open and a graph representation will be output to the filename. + GRAPH VIEWER CONTROLS: * Center on a node: left-click. * Pan view: left-drag. @@ -132,6 +135,16 @@ parser.add_option( "-f", "--file", help="View a specific dot-language graphfile.", metavar="FILE", action="store", default=None, dest="filename" ) +parser.add_option( "-O", "--output-file", + help="Output to a specific file, with a format given by --output-format" + + " or extrapolated from the extension.", + metavar="FILE", action="store", default=None, dest="output_filename" ) + +parser.add_option( "--output-format", + help="Specify a format for writing out the graph to --output-file " + + "e.g. png, svg, jpg, eps, dot.", + metavar="FORMAT", action="store", default=None, dest="output_format" ) + ( options, args ) = parser.parse_args() # import modules that require gtk now, so that a display is not needed @@ -155,6 +168,9 @@ if options.filename: from xdot import DotWindow except: raise SystemExit( "Failed to import the xdot viewer.") + if options.output_filename: + raise SystemExit( "ERROR: output-file not supported for " + + "dot files. Use 'dot' command instead." ) window = DotWindow() try: window.update( file ) @@ -168,6 +184,8 @@ if options.filename: gtk.main() sys.exit(0) +should_hide_gtk_window = (not options.output_filename) + suite, suiterc, watchers = parser.get_suite() # parse and plot the suite.rc dependency graph @@ -176,7 +194,8 @@ if len(args) < 1 or len(args) > 3: if options.namespaces: window = MyDotWindow2( suite, suiterc, options.templatevars, - options.templatevars_file, watchers ) + options.templatevars_file, watchers, + should_hide=should_hide_gtk_window ) else: # SUITE DEPENDENCY GRAPH @@ -201,6 +220,10 @@ window.widget.connect( 'clicked', on_url_clicked, window ) window.get_graph() +if options.output_filename: + window.graph.draw( options.output_filename, prog="dot" ) + sys.exit(0) + window.connect( 'destroy', gtk.main_quit) #if options.updatelive: diff --git a/lib/cylc/config.py b/lib/cylc/config.py index 83f9d2256a8..74934ef5f05 100644 --- a/lib/cylc/config.py +++ b/lib/cylc/config.py @@ -1468,6 +1468,7 @@ def get_graph_raw( self, start_ctime_str, stop_str, raw=False, startup_exclude_list = self.get_coldstart_task_list() stop = get_point( stop_str ) + print "stop:", stop for e in self.edges: # Get initial cycle point for this sequence diff --git a/lib/cylc/cylc_xdot.py b/lib/cylc/cylc_xdot.py index cd9d3f7a1bc..94360d0dae3 100644 --- a/lib/cylc/cylc_xdot.py +++ b/lib/cylc/cylc_xdot.py @@ -72,7 +72,8 @@ class MyDotWindow2( CylcDotViewerCommon ): ''' def __init__(self, suite, suiterc, template_vars, - template_vars_file, watch, orientation="TB" ): + template_vars_file, watch, orientation="TB", + should_hide=False ): self.outfile = None self.disable_output_image = False self.suite = suite @@ -169,7 +170,8 @@ def __init__(self, suite, suiterc, template_vars, #self.rc_mtimes[rc] = self.rc_last_mtimes[rc] break - self.show_all() + if not should_hide: + self.show_all() while True: if self.load_config(): break diff --git a/tests/cyclers/00-daily.t b/tests/cyclers/00-daily.t index dd5ed0ac141..d6ffaf59d2c 100644 --- a/tests/cyclers/00-daily.t +++ b/tests/cyclers/00-daily.t @@ -18,12 +18,14 @@ # Test intercycle dependencies. . $(dirname $0)/test_header #------------------------------------------------------------------------------- -set_test_number 2 +set_test_number 3 #------------------------------------------------------------------------------- install_suite $TEST_NAME_BASE $(basename $0 | sed "s/^.*-\(.*\)\.t/\1/g") #------------------------------------------------------------------------------- TEST_NAME=$TEST_NAME_BASE-validate -run_ok $TEST_NAME cylc validate $SUITE_NAME +run_ok $TEST_NAME cylc validate "$SUITE_NAME" +graph_suite "$SUITE_NAME" "$SUITE_NAME.graph.plain" +cmp_ok "$SUITE_NAME.graph.plain" <"$TEST_SOURCE_DIR/$SUITE_NAME/graph.plain.ref" #------------------------------------------------------------------------------- TEST_NAME=$TEST_NAME_BASE-run suite_run_ok $TEST_NAME cylc run --reference-test --debug $SUITE_NAME diff --git a/tests/cyclers/360/graph.plain.ref b/tests/cyclers/360/graph.plain.ref new file mode 100644 index 00000000000..8c71b4dbeca --- /dev/null +++ b/tests/cyclers/360/graph.plain.ref @@ -0,0 +1,9 @@ +edge "foo.20130228T00" "foo.20130229T00" solid black +edge "foo.20130229T00" "foo.20130230T00" solid black +edge "foo.20130230T00" "foo.20130301T00" solid black +graph +node "foo.20130228T00" "foo\n20130228T00" unfilled box black lightgrey +node "foo.20130229T00" "foo\n20130229T00" unfilled box black lightgrey +node "foo.20130230T00" "foo\n20130230T00" unfilled box black lightgrey +node "foo.20130301T00" "foo\n20130301T00" unfilled box black lightgrey +stop diff --git a/tests/cyclers/360/suite.rc b/tests/cyclers/360/suite.rc index 221707d217b..c07567b5f57 100644 --- a/tests/cyclers/360/suite.rc +++ b/tests/cyclers/360/suite.rc @@ -13,3 +13,6 @@ [runtime] [[foo]] command scripting = true +[visualization] + initial cycle point = 20130228T00 + final cycle point = 20130301T00 diff --git a/tests/cyclers/r1_multi_start_back_comp_async/graph.plain.ref b/tests/cyclers/r1_multi_start_back_comp_async/graph.plain.ref new file mode 100644 index 00000000000..f17bea73c95 --- /dev/null +++ b/tests/cyclers/r1_multi_start_back_comp_async/graph.plain.ref @@ -0,0 +1,11 @@ +edge "cold_foo.2014010100" "foo_dawn.2014010106" solid black +edge "cold_foo.2014010100" "foo_midnight.2014010100" solid black +edge "foo_dawn.2014010106" "foo_dawn.2014010206" solid black +edge "foo_midnight.2014010100" "foo_midnight.2014010200" solid black +graph +node "cold_foo.2014010100" "cold_foo\n2014010100" unfilled box black lightgrey +node "foo_dawn.2014010106" "foo_dawn\n2014010106" unfilled box black lightgrey +node "foo_dawn.2014010206" "foo_dawn\n2014010206" unfilled box black lightgrey +node "foo_midnight.2014010100" "foo_midnight\n2014010100" unfilled box black lightgrey +node "foo_midnight.2014010200" "foo_midnight\n2014010200" unfilled box black lightgrey +stop diff --git a/tests/cyclers/r1_multi_start_back_comp_async/suite.rc b/tests/cyclers/r1_multi_start_back_comp_async/suite.rc index e4fa470c698..64e09d029e0 100644 --- a/tests/cyclers/r1_multi_start_back_comp_async/suite.rc +++ b/tests/cyclers/r1_multi_start_back_comp_async/suite.rc @@ -12,3 +12,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20140101 + final cycle point = 2014010206 diff --git a/tests/cyclers/r1_multi_start_back_comp_start_up/graph.plain.ref b/tests/cyclers/r1_multi_start_back_comp_start_up/graph.plain.ref new file mode 100644 index 00000000000..f17bea73c95 --- /dev/null +++ b/tests/cyclers/r1_multi_start_back_comp_start_up/graph.plain.ref @@ -0,0 +1,11 @@ +edge "cold_foo.2014010100" "foo_dawn.2014010106" solid black +edge "cold_foo.2014010100" "foo_midnight.2014010100" solid black +edge "foo_dawn.2014010106" "foo_dawn.2014010206" solid black +edge "foo_midnight.2014010100" "foo_midnight.2014010200" solid black +graph +node "cold_foo.2014010100" "cold_foo\n2014010100" unfilled box black lightgrey +node "foo_dawn.2014010106" "foo_dawn\n2014010106" unfilled box black lightgrey +node "foo_dawn.2014010206" "foo_dawn\n2014010206" unfilled box black lightgrey +node "foo_midnight.2014010100" "foo_midnight\n2014010100" unfilled box black lightgrey +node "foo_midnight.2014010200" "foo_midnight\n2014010200" unfilled box black lightgrey +stop diff --git a/tests/cyclers/r1_multi_start_back_comp_start_up/suite.rc b/tests/cyclers/r1_multi_start_back_comp_start_up/suite.rc index 907663723f1..ea8beff4c58 100644 --- a/tests/cyclers/r1_multi_start_back_comp_start_up/suite.rc +++ b/tests/cyclers/r1_multi_start_back_comp_start_up/suite.rc @@ -13,3 +13,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20140101 + final cycle point = 2014010206 diff --git a/tests/lib/bash/test_header b/tests/lib/bash/test_header index ae06ed7cceb..f516d41095e 100644 --- a/tests/lib/bash/test_header +++ b/tests/lib/bash/test_header @@ -237,6 +237,17 @@ function exists_fail() { fail $TEST_NAME } +function graph_suite() { + SUITE_NAME=$1 + OUTPUT_FILE=$2 + shift 2 + echo "$@" >/dev/tty + TEMP_OUTPUT_FILE=$(mktemp XXXX-$(basename $OUTPUT_FILE)) + cylc graph --output-file="$TEMP_OUTPUT_FILE" "$SUITE_NAME" "$@" + sed -i "s/[.0-9]\+\( \|$\)//g" "$TEMP_OUTPUT_FILE" + sort $TEMP_OUTPUT_FILE >$OUTPUT_FILE +} + function init_suite() { SNAME=$( echo ${TEST_SOURCE_DIR##*tests/} | tr '/' '_' ) SUITE_NAME=$(date -u +%Y%m%dT%H%M%SZ)_cylc_test_${SNAME}_${1} From d141b17b04afba6765e26ea0612d6c1c58b0c204 Mon Sep 17 00:00:00 2001 From: Ben Fitzpatrick Date: Mon, 28 Jul 2014 10:53:59 +0100 Subject: [PATCH 3/6] #1008: add graph tests for cyclers suites --- tests/cyclers/00-daily.t | 8 +- tests/cyclers/23-multidaily_local.t | 12 ++- tests/cyclers/async_integer/graph.plain.ref | 5 + tests/cyclers/daily/graph.plain.ref | 13 +++ tests/cyclers/daily/suite.rc | 3 + tests/cyclers/hourly/graph.plain.ref | 21 ++++ tests/cyclers/hourly/suite.rc | 3 + tests/cyclers/integer1/graph.plain.ref | 79 +++++++++++++++ tests/cyclers/integer1/suite.rc | 2 + tests/cyclers/monthly/graph.plain.ref | 48 ++++++++++ tests/cyclers/monthly/suite.rc | 3 + tests/cyclers/multidaily/graph.plain.ref | 72 ++++++++++++++ tests/cyclers/multidaily/suite.rc | 3 + .../cyclers/multidaily_local/graph.plain.ref | 72 ++++++++++++++ tests/cyclers/multidaily_local/suite.rc | 3 + tests/cyclers/multihourly/graph.plain.ref | 96 +++++++++++++++++++ tests/cyclers/multihourly/suite.rc | 3 + tests/cyclers/multimonthly/graph.plain.ref | 64 +++++++++++++ tests/cyclers/multimonthly/suite.rc | 3 + tests/cyclers/multiweekly/graph.plain.ref | 32 +++++++ tests/cyclers/multiweekly/suite.rc | 3 + tests/cyclers/multiyearly/graph.plain.ref | 52 ++++++++++ tests/cyclers/multiyearly/suite.rc | 3 + tests/cyclers/offset_final/graph.plain.ref | 5 + tests/cyclers/offset_final/suite.rc | 3 + tests/cyclers/offset_initial/graph.plain.ref | 11 +++ tests/cyclers/offset_initial/suite.rc | 3 + tests/cyclers/r1_final/graph.plain.ref | 5 + tests/cyclers/r1_final/suite.rc | 3 + tests/cyclers/r1_initial/graph.plain.ref | 11 +++ tests/cyclers/r1_initial/suite.rc | 3 + tests/cyclers/r1_middle/graph.plain.ref | 5 + tests/cyclers/r1_middle/suite.rc | 3 + tests/cyclers/r1_multi_start/graph.plain.ref | 17 ++++ tests/cyclers/r1_multi_start/suite.rc | 3 + tests/cyclers/r5_final/graph.plain.ref | 17 ++++ tests/cyclers/r5_final/suite.rc | 3 + tests/cyclers/r5_initial/graph.plain.ref | 17 ++++ tests/cyclers/r5_initial/suite.rc | 3 + tests/cyclers/subhourly/graph.plain.ref | 17 ++++ tests/cyclers/subhourly/suite.rc | 3 + tests/cyclers/weekly/graph.plain.ref | 25 +++++ tests/cyclers/weekly/suite.rc | 3 + tests/cyclers/yearly/graph.plain.ref | 13 +++ tests/cyclers/yearly/suite.rc | 3 + 45 files changed, 775 insertions(+), 4 deletions(-) create mode 100644 tests/cyclers/async_integer/graph.plain.ref create mode 100644 tests/cyclers/daily/graph.plain.ref create mode 100644 tests/cyclers/hourly/graph.plain.ref create mode 100644 tests/cyclers/integer1/graph.plain.ref create mode 100644 tests/cyclers/monthly/graph.plain.ref create mode 100644 tests/cyclers/multidaily/graph.plain.ref create mode 100644 tests/cyclers/multidaily_local/graph.plain.ref create mode 100644 tests/cyclers/multihourly/graph.plain.ref create mode 100644 tests/cyclers/multimonthly/graph.plain.ref create mode 100644 tests/cyclers/multiweekly/graph.plain.ref create mode 100644 tests/cyclers/multiyearly/graph.plain.ref create mode 100644 tests/cyclers/offset_final/graph.plain.ref create mode 100644 tests/cyclers/offset_initial/graph.plain.ref create mode 100644 tests/cyclers/r1_final/graph.plain.ref create mode 100644 tests/cyclers/r1_initial/graph.plain.ref create mode 100644 tests/cyclers/r1_middle/graph.plain.ref create mode 100644 tests/cyclers/r1_multi_start/graph.plain.ref create mode 100644 tests/cyclers/r5_final/graph.plain.ref create mode 100644 tests/cyclers/r5_initial/graph.plain.ref create mode 100644 tests/cyclers/subhourly/graph.plain.ref create mode 100644 tests/cyclers/weekly/graph.plain.ref create mode 100644 tests/cyclers/yearly/graph.plain.ref diff --git a/tests/cyclers/00-daily.t b/tests/cyclers/00-daily.t index d6ffaf59d2c..0a9987a7b28 100644 --- a/tests/cyclers/00-daily.t +++ b/tests/cyclers/00-daily.t @@ -20,12 +20,16 @@ #------------------------------------------------------------------------------- set_test_number 3 #------------------------------------------------------------------------------- -install_suite $TEST_NAME_BASE $(basename $0 | sed "s/^.*-\(.*\)\.t/\1/g") +CHOSEN_SUITE=$(basename $0 | sed "s/^.*-\(.*\)\.t/\1/g") +install_suite $TEST_NAME_BASE $CHOSEN_SUITE #------------------------------------------------------------------------------- TEST_NAME=$TEST_NAME_BASE-validate run_ok $TEST_NAME cylc validate "$SUITE_NAME" +#------------------------------------------------------------------------------- +TEST_NAME=$TEST_NAME_BASE-graph graph_suite "$SUITE_NAME" "$SUITE_NAME.graph.plain" -cmp_ok "$SUITE_NAME.graph.plain" <"$TEST_SOURCE_DIR/$SUITE_NAME/graph.plain.ref" +cmp_ok "$SUITE_NAME.graph.plain" "$TEST_SOURCE_DIR/$CHOSEN_SUITE/graph.plain.ref" +xxdiff -D "$SUITE_NAME.graph.plain" "$TEST_SOURCE_DIR/$CHOSEN_SUITE/graph.plain.ref" #------------------------------------------------------------------------------- TEST_NAME=$TEST_NAME_BASE-run suite_run_ok $TEST_NAME cylc run --reference-test --debug $SUITE_NAME diff --git a/tests/cyclers/23-multidaily_local.t b/tests/cyclers/23-multidaily_local.t index 577b553d375..5390c6e34f8 100644 --- a/tests/cyclers/23-multidaily_local.t +++ b/tests/cyclers/23-multidaily_local.t @@ -18,9 +18,10 @@ # Test intercycle dependencies, local time. . $(dirname $0)/test_header #------------------------------------------------------------------------------- -set_test_number 2 +set_test_number 3 #------------------------------------------------------------------------------- -install_suite $TEST_NAME_BASE $(basename $0 | sed "s/^.*-\(.*\)\.t/\1/g") +CHOSEN_SUITE=$(basename $0 | sed "s/^.*-\(.*\)\.t/\1/g") +install_suite $TEST_NAME_BASE $CHOSEN_SUITE CURRENT_TZ_UTC_OFFSET=$(date +%z) if [[ $CURRENT_TZ_UTC_OFFSET == '+0000' ]]; then CURRENT_TZ_UTC_OFFSET="Z" @@ -32,6 +33,13 @@ sed -i "s/Z/$CURRENT_TZ_UTC_OFFSET/g" reference.log TEST_NAME=$TEST_NAME_BASE-validate run_ok $TEST_NAME cylc validate $SUITE_NAME #------------------------------------------------------------------------------- +TEST_NAME=$TEST_NAME_BASE-graph +graph_suite "$SUITE_NAME" "$SUITE_NAME.graph.plain" +sed "s/Z/$CURRENT_TZ_UTC_OFFSET/g" \ + "$TEST_SOURCE_DIR/$CHOSEN_SUITE/graph.plain.ref" > graph.plain.local.ref +cmp_ok "$SUITE_NAME.graph.plain" graph.plain.local.ref +xxdiff -D "$SUITE_NAME.graph.plain" graph.plain.local.ref +#------------------------------------------------------------------------------- TEST_NAME=$TEST_NAME_BASE-run suite_run_ok $TEST_NAME cylc run --reference-test --debug $SUITE_NAME #------------------------------------------------------------------------------- diff --git a/tests/cyclers/async_integer/graph.plain.ref b/tests/cyclers/async_integer/graph.plain.ref new file mode 100644 index 00000000000..7dac5d138f9 --- /dev/null +++ b/tests/cyclers/async_integer/graph.plain.ref @@ -0,0 +1,5 @@ +edge "foo.1" "bar.1" solid black +graph +node "bar.1" "bar\n1" unfilled box black lightgrey +node "foo.1" "foo\n1" unfilled box black lightgrey +stop diff --git a/tests/cyclers/daily/graph.plain.ref b/tests/cyclers/daily/graph.plain.ref new file mode 100644 index 00000000000..dac9e03098e --- /dev/null +++ b/tests/cyclers/daily/graph.plain.ref @@ -0,0 +1,13 @@ +edge "foo.20131231T2300Z" "bar.20131231T2300Z" solid black +edge "foo.20131231T2300Z" "foo.20140101T2300Z" solid black +edge "foo.20140101T2300Z" "bar.20140101T2300Z" solid black +edge "foo.20140101T2300Z" "foo.20140102T2300Z" solid black +edge "foo.20140102T2300Z" "bar.20140102T2300Z" solid black +graph +node "bar.20131231T2300Z" "bar\n20131231T2300Z" unfilled box black lightgrey +node "bar.20140101T2300Z" "bar\n20140101T2300Z" unfilled box black lightgrey +node "bar.20140102T2300Z" "bar\n20140102T2300Z" unfilled box black lightgrey +node "foo.20131231T2300Z" "foo\n20131231T2300Z" unfilled box black lightgrey +node "foo.20140101T2300Z" "foo\n20140101T2300Z" unfilled box black lightgrey +node "foo.20140102T2300Z" "foo\n20140102T2300Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/daily/suite.rc b/tests/cyclers/daily/suite.rc index 0a3b8a832d8..b6dfa9aa883 100644 --- a/tests/cyclers/daily/suite.rc +++ b/tests/cyclers/daily/suite.rc @@ -9,3 +9,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20131231T2300 + final cycle point = 20140103T0000 diff --git a/tests/cyclers/hourly/graph.plain.ref b/tests/cyclers/hourly/graph.plain.ref new file mode 100644 index 00000000000..5a45bf58ee5 --- /dev/null +++ b/tests/cyclers/hourly/graph.plain.ref @@ -0,0 +1,21 @@ +edge "foo.20000229T2000Z" "bar.20000229T2000Z" solid black +edge "foo.20000229T2000Z" "foo.20000229T2100Z" solid black +edge "foo.20000229T2100Z" "bar.20000229T2100Z" solid black +edge "foo.20000229T2100Z" "foo.20000229T2200Z" solid black +edge "foo.20000229T2200Z" "bar.20000229T2200Z" solid black +edge "foo.20000229T2200Z" "foo.20000229T2300Z" solid black +edge "foo.20000229T2300Z" "bar.20000229T2300Z" solid black +edge "foo.20000229T2300Z" "foo.20000301T0000Z" solid black +edge "foo.20000301T0000Z" "bar.20000301T0000Z" solid black +graph +node "bar.20000229T2000Z" "bar\n20000229T2000Z" unfilled box black lightgrey +node "bar.20000229T2100Z" "bar\n20000229T2100Z" unfilled box black lightgrey +node "bar.20000229T2200Z" "bar\n20000229T2200Z" unfilled box black lightgrey +node "bar.20000229T2300Z" "bar\n20000229T2300Z" unfilled box black lightgrey +node "bar.20000301T0000Z" "bar\n20000301T0000Z" unfilled box black lightgrey +node "foo.20000229T2000Z" "foo\n20000229T2000Z" unfilled box black lightgrey +node "foo.20000229T2100Z" "foo\n20000229T2100Z" unfilled box black lightgrey +node "foo.20000229T2200Z" "foo\n20000229T2200Z" unfilled box black lightgrey +node "foo.20000229T2300Z" "foo\n20000229T2300Z" unfilled box black lightgrey +node "foo.20000301T0000Z" "foo\n20000301T0000Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/hourly/suite.rc b/tests/cyclers/hourly/suite.rc index 996032940e8..792fbe79737 100644 --- a/tests/cyclers/hourly/suite.rc +++ b/tests/cyclers/hourly/suite.rc @@ -9,3 +9,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20000229T2000 + final cycle point = 20000301 diff --git a/tests/cyclers/integer1/graph.plain.ref b/tests/cyclers/integer1/graph.plain.ref new file mode 100644 index 00000000000..b418de1a046 --- /dev/null +++ b/tests/cyclers/integer1/graph.plain.ref @@ -0,0 +1,79 @@ +edge "foo.1" "bar.1" solid slateblue +edge "foo.1" "foo.4" solid slateblue +edge "foo.1" "on_toast.4" solid slateblue +edge "foo.10" "bar.10" solid slateblue +edge "foo.10" "foo.13" solid slateblue +edge "foo.10" "on_toast.13" solid slateblue +edge "foo.10" "qux.13" solid slateblue +edge "foo.13" "bar.13" solid slateblue +edge "foo.13" "foo.16" solid slateblue +edge "foo.13" "on_toast.16" solid slateblue +edge "foo.16" "bar.16" solid slateblue +edge "foo.4" "bar.4" solid slateblue +edge "foo.4" "foo.7" solid slateblue +edge "foo.4" "on_toast.7" solid slateblue +edge "foo.4" "qux.7" solid slateblue +edge "foo.7" "bar.7" solid slateblue +edge "foo.7" "foo.10" solid slateblue +edge "foo.7" "on_toast.10" solid slateblue +edge "seq.1" "foo.1" solid navajowhite +edge "seq.10" "foo.10" solid navajowhite +edge "seq.13" "foo.13" solid navajowhite +edge "seq.16" "foo.16" solid navajowhite +edge "seq.4" "foo.4" solid navajowhite +edge "seq.7" "foo.7" solid navajowhite +edge "woo.11" "bar.10" solid limegreen +edge "woo.11" "foo.10" solid limegreen +edge "woo.12" "foo.13" solid limegreen +edge "woo.14" "bar.13" solid limegreen +edge "woo.14" "foo.13" solid limegreen +edge "woo.15" "foo.16" solid limegreen +edge "woo.17" "bar.16" solid limegreen +edge "woo.17" "foo.16" solid limegreen +edge "woo.2" "bar.1" solid limegreen +edge "woo.2" "foo.1" solid limegreen +edge "woo.3" "foo.4" solid limegreen +edge "woo.5" "bar.4" solid limegreen +edge "woo.5" "foo.4" solid limegreen +edge "woo.6" "foo.7" solid limegreen +edge "woo.8" "bar.7" solid limegreen +edge "woo.8" "foo.7" solid limegreen +edge "woo.9" "foo.10" solid limegreen +graph +node "bar.1" "bar\n1" filled ellipse black orange +node "bar.10" "bar\n10" filled ellipse black orange +node "bar.13" "bar\n13" filled ellipse black orange +node "bar.16" "bar\n16" filled ellipse black orange +node "bar.4" "bar\n4" filled ellipse black orange +node "bar.7" "bar\n7" filled ellipse black orange +node "foo.1" "foo\n1" filled ellipse black slateblue +node "foo.10" "foo\n10" filled ellipse black slateblue +node "foo.13" "foo\n13" filled ellipse black slateblue +node "foo.16" "foo\n16" filled ellipse black slateblue +node "foo.4" "foo\n4" filled ellipse black slateblue +node "foo.7" "foo\n7" filled ellipse black slateblue +node "on_toast.10" "on_toast\n10" filled ellipse black beige +node "on_toast.13" "on_toast\n13" filled ellipse black beige +node "on_toast.16" "on_toast\n16" filled ellipse black beige +node "on_toast.4" "on_toast\n4" filled ellipse black beige +node "on_toast.7" "on_toast\n7" filled ellipse black beige +node "qux.13" "qux\n13" filled ellipse black orangered +node "qux.7" "qux\n7" filled ellipse black orangered +node "seq.1" "seq\n1" filled ellipse black navajowhite +node "seq.10" "seq\n10" filled ellipse black navajowhite +node "seq.13" "seq\n13" filled ellipse black navajowhite +node "seq.16" "seq\n16" filled ellipse black navajowhite +node "seq.4" "seq\n4" filled ellipse black navajowhite +node "seq.7" "seq\n7" filled ellipse black navajowhite +node "woo.11" "woo\n11" filled ellipse black limegreen +node "woo.12" "woo\n12" filled ellipse black limegreen +node "woo.14" "woo\n14" filled ellipse black limegreen +node "woo.15" "woo\n15" filled ellipse black limegreen +node "woo.17" "woo\n17" filled ellipse black limegreen +node "woo.2" "woo\n2" filled ellipse black limegreen +node "woo.3" "woo\n3" filled ellipse black limegreen +node "woo.5" "woo\n5" filled ellipse black limegreen +node "woo.6" "woo\n6" filled ellipse black limegreen +node "woo.8" "woo\n8" filled ellipse black limegreen +node "woo.9" "woo\n9" filled ellipse black limegreen +stop diff --git a/tests/cyclers/integer1/suite.rc b/tests/cyclers/integer1/suite.rc index 390ce67cf59..1a3884d02b5 100644 --- a/tests/cyclers/integer1/suite.rc +++ b/tests/cyclers/integer1/suite.rc @@ -40,6 +40,8 @@ sleep 5 [visualization] default node attributes = "style=filled" + initial cycle point = 1 + final cycle point = 16 [[node attributes]] foo = "fillcolor=slateblue" woo = "fillcolor=limegreen" diff --git a/tests/cyclers/monthly/graph.plain.ref b/tests/cyclers/monthly/graph.plain.ref new file mode 100644 index 00000000000..cd720eb9bda --- /dev/null +++ b/tests/cyclers/monthly/graph.plain.ref @@ -0,0 +1,48 @@ +edge "foo.20000131T0100Z" "bar.20000131T0100Z" solid black +edge "foo.20000229T0100Z" "bar.20000229T0100Z" solid black +edge "foo.20000229T0100Z" "foo.20000329T0100Z" solid black +edge "foo.20000329T0100Z" "bar.20000329T0100Z" solid black +edge "foo.20000329T0100Z" "foo.20000429T0100Z" solid black +edge "foo.20000429T0100Z" "bar.20000429T0100Z" solid black +edge "foo.20000429T0100Z" "foo.20000529T0100Z" solid black +edge "foo.20000529T0100Z" "bar.20000529T0100Z" solid black +edge "foo.20000529T0100Z" "foo.20000629T0100Z" solid black +edge "foo.20000629T0100Z" "bar.20000629T0100Z" solid black +edge "foo.20000629T0100Z" "foo.20000729T0100Z" solid black +edge "foo.20000729T0100Z" "bar.20000729T0100Z" solid black +edge "foo.20000729T0100Z" "foo.20000829T0100Z" solid black +edge "foo.20000829T0100Z" "bar.20000829T0100Z" solid black +edge "foo.20000829T0100Z" "foo.20000929T0100Z" solid black +edge "foo.20000929T0100Z" "bar.20000929T0100Z" solid black +edge "foo.20000929T0100Z" "foo.20001029T0100Z" solid black +edge "foo.20001029T0100Z" "bar.20001029T0100Z" solid black +edge "foo.20001029T0100Z" "foo.20001129T0100Z" solid black +edge "foo.20001129T0100Z" "bar.20001129T0100Z" solid black +edge "foo.20001129T0100Z" "foo.20001229T0100Z" solid black +edge "foo.20001229T0100Z" "bar.20001229T0100Z" solid black +graph +node "bar.20000131T0100Z" "bar\n20000131T0100Z" unfilled box black lightgrey +node "bar.20000229T0100Z" "bar\n20000229T0100Z" unfilled box black lightgrey +node "bar.20000329T0100Z" "bar\n20000329T0100Z" unfilled box black lightgrey +node "bar.20000429T0100Z" "bar\n20000429T0100Z" unfilled box black lightgrey +node "bar.20000529T0100Z" "bar\n20000529T0100Z" unfilled box black lightgrey +node "bar.20000629T0100Z" "bar\n20000629T0100Z" unfilled box black lightgrey +node "bar.20000729T0100Z" "bar\n20000729T0100Z" unfilled box black lightgrey +node "bar.20000829T0100Z" "bar\n20000829T0100Z" unfilled box black lightgrey +node "bar.20000929T0100Z" "bar\n20000929T0100Z" unfilled box black lightgrey +node "bar.20001029T0100Z" "bar\n20001029T0100Z" unfilled box black lightgrey +node "bar.20001129T0100Z" "bar\n20001129T0100Z" unfilled box black lightgrey +node "bar.20001229T0100Z" "bar\n20001229T0100Z" unfilled box black lightgrey +node "foo.20000131T0100Z" "foo\n20000131T0100Z" unfilled box black lightgrey +node "foo.20000229T0100Z" "foo\n20000229T0100Z" unfilled box black lightgrey +node "foo.20000329T0100Z" "foo\n20000329T0100Z" unfilled box black lightgrey +node "foo.20000429T0100Z" "foo\n20000429T0100Z" unfilled box black lightgrey +node "foo.20000529T0100Z" "foo\n20000529T0100Z" unfilled box black lightgrey +node "foo.20000629T0100Z" "foo\n20000629T0100Z" unfilled box black lightgrey +node "foo.20000729T0100Z" "foo\n20000729T0100Z" unfilled box black lightgrey +node "foo.20000829T0100Z" "foo\n20000829T0100Z" unfilled box black lightgrey +node "foo.20000929T0100Z" "foo\n20000929T0100Z" unfilled box black lightgrey +node "foo.20001029T0100Z" "foo\n20001029T0100Z" unfilled box black lightgrey +node "foo.20001129T0100Z" "foo\n20001129T0100Z" unfilled box black lightgrey +node "foo.20001229T0100Z" "foo\n20001229T0100Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/monthly/suite.rc b/tests/cyclers/monthly/suite.rc index 8dff495d89f..132d94586d5 100644 --- a/tests/cyclers/monthly/suite.rc +++ b/tests/cyclers/monthly/suite.rc @@ -11,3 +11,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20000131T0100Z + final cycle point = 2001 diff --git a/tests/cyclers/multidaily/graph.plain.ref b/tests/cyclers/multidaily/graph.plain.ref new file mode 100644 index 00000000000..d233cd5dd42 --- /dev/null +++ b/tests/cyclers/multidaily/graph.plain.ref @@ -0,0 +1,72 @@ +edge "baz.20001231T0100Z" "baz.20010104T0100Z" solid black +edge "baz.20001231T0100Z" "qux.20001231T0100Z" solid black +edge "baz.20010104T0100Z" "baz.20010108T0100Z" solid black +edge "baz.20010104T0100Z" "qux.20010104T0100Z" solid black +edge "baz.20010108T0100Z" "baz.20010112T0100Z" solid black +edge "baz.20010108T0100Z" "qux.20010108T0100Z" solid black +edge "baz.20010112T0100Z" "qux.20010112T0100Z" solid black +edge "foo.20001231T0100Z" "bar.20001231T0100Z" solid black +edge "foo.20001231T0100Z" "foo.20010101T0100Z" solid black +edge "foo.20010101T0100Z" "bar.20010101T0100Z" solid black +edge "foo.20010101T0100Z" "foo.20010102T0100Z" solid black +edge "foo.20010102T0100Z" "bar.20010102T0100Z" solid black +edge "foo.20010102T0100Z" "foo.20010103T0100Z" solid black +edge "foo.20010103T0100Z" "bar.20010103T0100Z" solid black +edge "foo.20010103T0100Z" "foo.20010104T0100Z" solid black +edge "foo.20010104T0100Z" "bar.20010104T0100Z" solid black +edge "foo.20010104T0100Z" "foo.20010105T0100Z" solid black +edge "foo.20010105T0100Z" "bar.20010105T0100Z" solid black +edge "foo.20010105T0100Z" "foo.20010106T0100Z" solid black +edge "foo.20010106T0100Z" "bar.20010106T0100Z" solid black +edge "foo.20010106T0100Z" "foo.20010107T0100Z" solid black +edge "foo.20010107T0100Z" "bar.20010107T0100Z" solid black +edge "foo.20010107T0100Z" "foo.20010108T0100Z" solid black +edge "foo.20010108T0100Z" "bar.20010108T0100Z" solid black +edge "foo.20010108T0100Z" "foo.20010109T0100Z" solid black +edge "foo.20010109T0100Z" "bar.20010109T0100Z" solid black +edge "foo.20010109T0100Z" "foo.20010110T0100Z" solid black +edge "foo.20010110T0100Z" "bar.20010110T0100Z" solid black +edge "foo.20010110T0100Z" "foo.20010111T0100Z" solid black +edge "foo.20010111T0100Z" "bar.20010111T0100Z" solid black +edge "foo.20010111T0100Z" "foo.20010112T0100Z" solid black +edge "foo.20010112T0100Z" "bar.20010112T0100Z" solid black +edge "foo.20010112T0100Z" "foo.20010113T0100Z" solid black +edge "foo.20010113T0100Z" "bar.20010113T0100Z" solid black +graph +node "bar.20001231T0100Z" "bar\n20001231T0100Z" unfilled box black lightgrey +node "bar.20010101T0100Z" "bar\n20010101T0100Z" unfilled box black lightgrey +node "bar.20010102T0100Z" "bar\n20010102T0100Z" unfilled box black lightgrey +node "bar.20010103T0100Z" "bar\n20010103T0100Z" unfilled box black lightgrey +node "bar.20010104T0100Z" "bar\n20010104T0100Z" unfilled box black lightgrey +node "bar.20010105T0100Z" "bar\n20010105T0100Z" unfilled box black lightgrey +node "bar.20010106T0100Z" "bar\n20010106T0100Z" unfilled box black lightgrey +node "bar.20010107T0100Z" "bar\n20010107T0100Z" unfilled box black lightgrey +node "bar.20010108T0100Z" "bar\n20010108T0100Z" unfilled box black lightgrey +node "bar.20010109T0100Z" "bar\n20010109T0100Z" unfilled box black lightgrey +node "bar.20010110T0100Z" "bar\n20010110T0100Z" unfilled box black lightgrey +node "bar.20010111T0100Z" "bar\n20010111T0100Z" unfilled box black lightgrey +node "bar.20010112T0100Z" "bar\n20010112T0100Z" unfilled box black lightgrey +node "bar.20010113T0100Z" "bar\n20010113T0100Z" unfilled box black lightgrey +node "baz.20001231T0100Z" "baz\n20001231T0100Z" unfilled box black lightgrey +node "baz.20010104T0100Z" "baz\n20010104T0100Z" unfilled box black lightgrey +node "baz.20010108T0100Z" "baz\n20010108T0100Z" unfilled box black lightgrey +node "baz.20010112T0100Z" "baz\n20010112T0100Z" unfilled box black lightgrey +node "foo.20001231T0100Z" "foo\n20001231T0100Z" unfilled box black lightgrey +node "foo.20010101T0100Z" "foo\n20010101T0100Z" unfilled box black lightgrey +node "foo.20010102T0100Z" "foo\n20010102T0100Z" unfilled box black lightgrey +node "foo.20010103T0100Z" "foo\n20010103T0100Z" unfilled box black lightgrey +node "foo.20010104T0100Z" "foo\n20010104T0100Z" unfilled box black lightgrey +node "foo.20010105T0100Z" "foo\n20010105T0100Z" unfilled box black lightgrey +node "foo.20010106T0100Z" "foo\n20010106T0100Z" unfilled box black lightgrey +node "foo.20010107T0100Z" "foo\n20010107T0100Z" unfilled box black lightgrey +node "foo.20010108T0100Z" "foo\n20010108T0100Z" unfilled box black lightgrey +node "foo.20010109T0100Z" "foo\n20010109T0100Z" unfilled box black lightgrey +node "foo.20010110T0100Z" "foo\n20010110T0100Z" unfilled box black lightgrey +node "foo.20010111T0100Z" "foo\n20010111T0100Z" unfilled box black lightgrey +node "foo.20010112T0100Z" "foo\n20010112T0100Z" unfilled box black lightgrey +node "foo.20010113T0100Z" "foo\n20010113T0100Z" unfilled box black lightgrey +node "qux.20001231T0100Z" "qux\n20001231T0100Z" unfilled box black lightgrey +node "qux.20010104T0100Z" "qux\n20010104T0100Z" unfilled box black lightgrey +node "qux.20010108T0100Z" "qux\n20010108T0100Z" unfilled box black lightgrey +node "qux.20010112T0100Z" "qux\n20010112T0100Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/multidaily/suite.rc b/tests/cyclers/multidaily/suite.rc index c48546a42ed..03d5fef604f 100644 --- a/tests/cyclers/multidaily/suite.rc +++ b/tests/cyclers/multidaily/suite.rc @@ -13,3 +13,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20001231T0100 + final cycle point = 20010114 diff --git a/tests/cyclers/multidaily_local/graph.plain.ref b/tests/cyclers/multidaily_local/graph.plain.ref new file mode 100644 index 00000000000..d233cd5dd42 --- /dev/null +++ b/tests/cyclers/multidaily_local/graph.plain.ref @@ -0,0 +1,72 @@ +edge "baz.20001231T0100Z" "baz.20010104T0100Z" solid black +edge "baz.20001231T0100Z" "qux.20001231T0100Z" solid black +edge "baz.20010104T0100Z" "baz.20010108T0100Z" solid black +edge "baz.20010104T0100Z" "qux.20010104T0100Z" solid black +edge "baz.20010108T0100Z" "baz.20010112T0100Z" solid black +edge "baz.20010108T0100Z" "qux.20010108T0100Z" solid black +edge "baz.20010112T0100Z" "qux.20010112T0100Z" solid black +edge "foo.20001231T0100Z" "bar.20001231T0100Z" solid black +edge "foo.20001231T0100Z" "foo.20010101T0100Z" solid black +edge "foo.20010101T0100Z" "bar.20010101T0100Z" solid black +edge "foo.20010101T0100Z" "foo.20010102T0100Z" solid black +edge "foo.20010102T0100Z" "bar.20010102T0100Z" solid black +edge "foo.20010102T0100Z" "foo.20010103T0100Z" solid black +edge "foo.20010103T0100Z" "bar.20010103T0100Z" solid black +edge "foo.20010103T0100Z" "foo.20010104T0100Z" solid black +edge "foo.20010104T0100Z" "bar.20010104T0100Z" solid black +edge "foo.20010104T0100Z" "foo.20010105T0100Z" solid black +edge "foo.20010105T0100Z" "bar.20010105T0100Z" solid black +edge "foo.20010105T0100Z" "foo.20010106T0100Z" solid black +edge "foo.20010106T0100Z" "bar.20010106T0100Z" solid black +edge "foo.20010106T0100Z" "foo.20010107T0100Z" solid black +edge "foo.20010107T0100Z" "bar.20010107T0100Z" solid black +edge "foo.20010107T0100Z" "foo.20010108T0100Z" solid black +edge "foo.20010108T0100Z" "bar.20010108T0100Z" solid black +edge "foo.20010108T0100Z" "foo.20010109T0100Z" solid black +edge "foo.20010109T0100Z" "bar.20010109T0100Z" solid black +edge "foo.20010109T0100Z" "foo.20010110T0100Z" solid black +edge "foo.20010110T0100Z" "bar.20010110T0100Z" solid black +edge "foo.20010110T0100Z" "foo.20010111T0100Z" solid black +edge "foo.20010111T0100Z" "bar.20010111T0100Z" solid black +edge "foo.20010111T0100Z" "foo.20010112T0100Z" solid black +edge "foo.20010112T0100Z" "bar.20010112T0100Z" solid black +edge "foo.20010112T0100Z" "foo.20010113T0100Z" solid black +edge "foo.20010113T0100Z" "bar.20010113T0100Z" solid black +graph +node "bar.20001231T0100Z" "bar\n20001231T0100Z" unfilled box black lightgrey +node "bar.20010101T0100Z" "bar\n20010101T0100Z" unfilled box black lightgrey +node "bar.20010102T0100Z" "bar\n20010102T0100Z" unfilled box black lightgrey +node "bar.20010103T0100Z" "bar\n20010103T0100Z" unfilled box black lightgrey +node "bar.20010104T0100Z" "bar\n20010104T0100Z" unfilled box black lightgrey +node "bar.20010105T0100Z" "bar\n20010105T0100Z" unfilled box black lightgrey +node "bar.20010106T0100Z" "bar\n20010106T0100Z" unfilled box black lightgrey +node "bar.20010107T0100Z" "bar\n20010107T0100Z" unfilled box black lightgrey +node "bar.20010108T0100Z" "bar\n20010108T0100Z" unfilled box black lightgrey +node "bar.20010109T0100Z" "bar\n20010109T0100Z" unfilled box black lightgrey +node "bar.20010110T0100Z" "bar\n20010110T0100Z" unfilled box black lightgrey +node "bar.20010111T0100Z" "bar\n20010111T0100Z" unfilled box black lightgrey +node "bar.20010112T0100Z" "bar\n20010112T0100Z" unfilled box black lightgrey +node "bar.20010113T0100Z" "bar\n20010113T0100Z" unfilled box black lightgrey +node "baz.20001231T0100Z" "baz\n20001231T0100Z" unfilled box black lightgrey +node "baz.20010104T0100Z" "baz\n20010104T0100Z" unfilled box black lightgrey +node "baz.20010108T0100Z" "baz\n20010108T0100Z" unfilled box black lightgrey +node "baz.20010112T0100Z" "baz\n20010112T0100Z" unfilled box black lightgrey +node "foo.20001231T0100Z" "foo\n20001231T0100Z" unfilled box black lightgrey +node "foo.20010101T0100Z" "foo\n20010101T0100Z" unfilled box black lightgrey +node "foo.20010102T0100Z" "foo\n20010102T0100Z" unfilled box black lightgrey +node "foo.20010103T0100Z" "foo\n20010103T0100Z" unfilled box black lightgrey +node "foo.20010104T0100Z" "foo\n20010104T0100Z" unfilled box black lightgrey +node "foo.20010105T0100Z" "foo\n20010105T0100Z" unfilled box black lightgrey +node "foo.20010106T0100Z" "foo\n20010106T0100Z" unfilled box black lightgrey +node "foo.20010107T0100Z" "foo\n20010107T0100Z" unfilled box black lightgrey +node "foo.20010108T0100Z" "foo\n20010108T0100Z" unfilled box black lightgrey +node "foo.20010109T0100Z" "foo\n20010109T0100Z" unfilled box black lightgrey +node "foo.20010110T0100Z" "foo\n20010110T0100Z" unfilled box black lightgrey +node "foo.20010111T0100Z" "foo\n20010111T0100Z" unfilled box black lightgrey +node "foo.20010112T0100Z" "foo\n20010112T0100Z" unfilled box black lightgrey +node "foo.20010113T0100Z" "foo\n20010113T0100Z" unfilled box black lightgrey +node "qux.20001231T0100Z" "qux\n20001231T0100Z" unfilled box black lightgrey +node "qux.20010104T0100Z" "qux\n20010104T0100Z" unfilled box black lightgrey +node "qux.20010108T0100Z" "qux\n20010108T0100Z" unfilled box black lightgrey +node "qux.20010112T0100Z" "qux\n20010112T0100Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/multidaily_local/suite.rc b/tests/cyclers/multidaily_local/suite.rc index d21028008d5..e3864104c7e 100644 --- a/tests/cyclers/multidaily_local/suite.rc +++ b/tests/cyclers/multidaily_local/suite.rc @@ -12,3 +12,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20001231T0100 + final cycle point = 20010114 diff --git a/tests/cyclers/multihourly/graph.plain.ref b/tests/cyclers/multihourly/graph.plain.ref new file mode 100644 index 00000000000..a170aeebfb2 --- /dev/null +++ b/tests/cyclers/multihourly/graph.plain.ref @@ -0,0 +1,96 @@ +edge "baz.20000131T1400+13" "baz.20000131T2000+13" solid black +edge "baz.20000131T1400+13" "qux.20000131T1400+13" solid black +edge "baz.20000131T2000+13" "baz.20000201T0200+13" solid black +edge "baz.20000131T2000+13" "qux.20000131T2000+13" solid black +edge "baz.20000201T0200+13" "baz.20000201T0800+13" solid black +edge "baz.20000201T0200+13" "qux.20000201T0200+13" solid black +edge "baz.20000201T0800+13" "baz.20000201T1400+13" solid black +edge "baz.20000201T0800+13" "qux.20000201T0800+13" solid black +edge "baz.20000201T1400+13" "baz.20000201T2000+13" solid black +edge "baz.20000201T1400+13" "qux.20000201T1400+13" solid black +edge "baz.20000201T2000+13" "baz.20000202T0200+13" solid black +edge "baz.20000201T2000+13" "qux.20000201T2000+13" solid black +edge "baz.20000202T0200+13" "baz.20000202T0800+13" solid black +edge "baz.20000202T0200+13" "qux.20000202T0200+13" solid black +edge "baz.20000202T0800+13" "qux.20000202T0800+13" solid black +edge "foo.20000131T1400+13" "bar.20000131T1400+13" solid black +edge "foo.20000131T1400+13" "foo.20000131T1700+13" solid black +edge "foo.20000131T1700+13" "bar.20000131T1700+13" solid black +edge "foo.20000131T1700+13" "foo.20000131T2000+13" solid black +edge "foo.20000131T2000+13" "bar.20000131T2000+13" solid black +edge "foo.20000131T2000+13" "foo.20000131T2300+13" solid black +edge "foo.20000131T2300+13" "bar.20000131T2300+13" solid black +edge "foo.20000131T2300+13" "foo.20000201T0200+13" solid black +edge "foo.20000201T0200+13" "bar.20000201T0200+13" solid black +edge "foo.20000201T0200+13" "foo.20000201T0500+13" solid black +edge "foo.20000201T0500+13" "bar.20000201T0500+13" solid black +edge "foo.20000201T0500+13" "foo.20000201T0800+13" solid black +edge "foo.20000201T0800+13" "bar.20000201T0800+13" solid black +edge "foo.20000201T0800+13" "foo.20000201T1100+13" solid black +edge "foo.20000201T1100+13" "bar.20000201T1100+13" solid black +edge "foo.20000201T1100+13" "foo.20000201T1400+13" solid black +edge "foo.20000201T1400+13" "bar.20000201T1400+13" solid black +edge "foo.20000201T1400+13" "foo.20000201T1700+13" solid black +edge "foo.20000201T1700+13" "bar.20000201T1700+13" solid black +edge "foo.20000201T1700+13" "foo.20000201T2000+13" solid black +edge "foo.20000201T2000+13" "bar.20000201T2000+13" solid black +edge "foo.20000201T2000+13" "foo.20000201T2300+13" solid black +edge "foo.20000201T2300+13" "bar.20000201T2300+13" solid black +edge "foo.20000201T2300+13" "foo.20000202T0200+13" solid black +edge "foo.20000202T0200+13" "bar.20000202T0200+13" solid black +edge "foo.20000202T0200+13" "foo.20000202T0500+13" solid black +edge "foo.20000202T0500+13" "bar.20000202T0500+13" solid black +edge "foo.20000202T0500+13" "foo.20000202T0800+13" solid black +edge "foo.20000202T0800+13" "bar.20000202T0800+13" solid black +edge "foo.20000202T0800+13" "foo.20000202T1100+13" solid black +edge "foo.20000202T1100+13" "bar.20000202T1100+13" solid black +graph +node "bar.20000131T1400+13" "bar\n20000131T1400+13" unfilled box black lightgrey +node "bar.20000131T1700+13" "bar\n20000131T1700+13" unfilled box black lightgrey +node "bar.20000131T2000+13" "bar\n20000131T2000+13" unfilled box black lightgrey +node "bar.20000131T2300+13" "bar\n20000131T2300+13" unfilled box black lightgrey +node "bar.20000201T0200+13" "bar\n20000201T0200+13" unfilled box black lightgrey +node "bar.20000201T0500+13" "bar\n20000201T0500+13" unfilled box black lightgrey +node "bar.20000201T0800+13" "bar\n20000201T0800+13" unfilled box black lightgrey +node "bar.20000201T1100+13" "bar\n20000201T1100+13" unfilled box black lightgrey +node "bar.20000201T1400+13" "bar\n20000201T1400+13" unfilled box black lightgrey +node "bar.20000201T1700+13" "bar\n20000201T1700+13" unfilled box black lightgrey +node "bar.20000201T2000+13" "bar\n20000201T2000+13" unfilled box black lightgrey +node "bar.20000201T2300+13" "bar\n20000201T2300+13" unfilled box black lightgrey +node "bar.20000202T0200+13" "bar\n20000202T0200+13" unfilled box black lightgrey +node "bar.20000202T0500+13" "bar\n20000202T0500+13" unfilled box black lightgrey +node "bar.20000202T0800+13" "bar\n20000202T0800+13" unfilled box black lightgrey +node "bar.20000202T1100+13" "bar\n20000202T1100+13" unfilled box black lightgrey +node "baz.20000131T1400+13" "baz\n20000131T1400+13" unfilled box black lightgrey +node "baz.20000131T2000+13" "baz\n20000131T2000+13" unfilled box black lightgrey +node "baz.20000201T0200+13" "baz\n20000201T0200+13" unfilled box black lightgrey +node "baz.20000201T0800+13" "baz\n20000201T0800+13" unfilled box black lightgrey +node "baz.20000201T1400+13" "baz\n20000201T1400+13" unfilled box black lightgrey +node "baz.20000201T2000+13" "baz\n20000201T2000+13" unfilled box black lightgrey +node "baz.20000202T0200+13" "baz\n20000202T0200+13" unfilled box black lightgrey +node "baz.20000202T0800+13" "baz\n20000202T0800+13" unfilled box black lightgrey +node "foo.20000131T1400+13" "foo\n20000131T1400+13" unfilled box black lightgrey +node "foo.20000131T1700+13" "foo\n20000131T1700+13" unfilled box black lightgrey +node "foo.20000131T2000+13" "foo\n20000131T2000+13" unfilled box black lightgrey +node "foo.20000131T2300+13" "foo\n20000131T2300+13" unfilled box black lightgrey +node "foo.20000201T0200+13" "foo\n20000201T0200+13" unfilled box black lightgrey +node "foo.20000201T0500+13" "foo\n20000201T0500+13" unfilled box black lightgrey +node "foo.20000201T0800+13" "foo\n20000201T0800+13" unfilled box black lightgrey +node "foo.20000201T1100+13" "foo\n20000201T1100+13" unfilled box black lightgrey +node "foo.20000201T1400+13" "foo\n20000201T1400+13" unfilled box black lightgrey +node "foo.20000201T1700+13" "foo\n20000201T1700+13" unfilled box black lightgrey +node "foo.20000201T2000+13" "foo\n20000201T2000+13" unfilled box black lightgrey +node "foo.20000201T2300+13" "foo\n20000201T2300+13" unfilled box black lightgrey +node "foo.20000202T0200+13" "foo\n20000202T0200+13" unfilled box black lightgrey +node "foo.20000202T0500+13" "foo\n20000202T0500+13" unfilled box black lightgrey +node "foo.20000202T0800+13" "foo\n20000202T0800+13" unfilled box black lightgrey +node "foo.20000202T1100+13" "foo\n20000202T1100+13" unfilled box black lightgrey +node "qux.20000131T1400+13" "qux\n20000131T1400+13" unfilled box black lightgrey +node "qux.20000131T2000+13" "qux\n20000131T2000+13" unfilled box black lightgrey +node "qux.20000201T0200+13" "qux\n20000201T0200+13" unfilled box black lightgrey +node "qux.20000201T0800+13" "qux\n20000201T0800+13" unfilled box black lightgrey +node "qux.20000201T1400+13" "qux\n20000201T1400+13" unfilled box black lightgrey +node "qux.20000201T2000+13" "qux\n20000201T2000+13" unfilled box black lightgrey +node "qux.20000202T0200+13" "qux\n20000202T0200+13" unfilled box black lightgrey +node "qux.20000202T0800+13" "qux\n20000202T0800+13" unfilled box black lightgrey +stop diff --git a/tests/cyclers/multihourly/suite.rc b/tests/cyclers/multihourly/suite.rc index 07f1a5e9e5f..cab9343963f 100644 --- a/tests/cyclers/multihourly/suite.rc +++ b/tests/cyclers/multihourly/suite.rc @@ -13,3 +13,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20000131T0100Z + final cycle point = 20000202T0600+0600 diff --git a/tests/cyclers/multimonthly/graph.plain.ref b/tests/cyclers/multimonthly/graph.plain.ref new file mode 100644 index 00000000000..fc97c036bba --- /dev/null +++ b/tests/cyclers/multimonthly/graph.plain.ref @@ -0,0 +1,64 @@ +edge "baz.10000101T0000Z" "baz.10000701T0000Z" solid black +edge "baz.10000101T0000Z" "qux.10000101T0000Z" solid black +edge "baz.10000701T0000Z" "baz.10010101T0000Z" solid black +edge "baz.10000701T0000Z" "qux.10000701T0000Z" solid black +edge "baz.10010101T0000Z" "qux.10010101T0000Z" solid black +edge "foo.10000101T0000Z" "bar.10000101T0000Z" solid black +edge "foo.10000101T0000Z" "foo.10000201T0000Z" solid black +edge "foo.10000201T0000Z" "bar.10000201T0000Z" solid black +edge "foo.10000201T0000Z" "foo.10000301T0000Z" solid black +edge "foo.10000301T0000Z" "bar.10000301T0000Z" solid black +edge "foo.10000301T0000Z" "foo.10000401T0000Z" solid black +edge "foo.10000401T0000Z" "bar.10000401T0000Z" solid black +edge "foo.10000401T0000Z" "foo.10000501T0000Z" solid black +edge "foo.10000501T0000Z" "bar.10000501T0000Z" solid black +edge "foo.10000501T0000Z" "foo.10000601T0000Z" solid black +edge "foo.10000601T0000Z" "bar.10000601T0000Z" solid black +edge "foo.10000601T0000Z" "foo.10000701T0000Z" solid black +edge "foo.10000701T0000Z" "bar.10000701T0000Z" solid black +edge "foo.10000701T0000Z" "foo.10000801T0000Z" solid black +edge "foo.10000801T0000Z" "bar.10000801T0000Z" solid black +edge "foo.10000801T0000Z" "foo.10000901T0000Z" solid black +edge "foo.10000901T0000Z" "bar.10000901T0000Z" solid black +edge "foo.10000901T0000Z" "foo.10001001T0000Z" solid black +edge "foo.10001001T0000Z" "bar.10001001T0000Z" solid black +edge "foo.10001001T0000Z" "foo.10001101T0000Z" solid black +edge "foo.10001101T0000Z" "bar.10001101T0000Z" solid black +edge "foo.10001101T0000Z" "foo.10001201T0000Z" solid black +edge "foo.10001201T0000Z" "bar.10001201T0000Z" solid black +edge "foo.10001201T0000Z" "foo.10010101T0000Z" solid black +edge "foo.10010101T0000Z" "bar.10010101T0000Z" solid black +graph +node "bar.10000101T0000Z" "bar\n10000101T0000Z" unfilled box black lightgrey +node "bar.10000201T0000Z" "bar\n10000201T0000Z" unfilled box black lightgrey +node "bar.10000301T0000Z" "bar\n10000301T0000Z" unfilled box black lightgrey +node "bar.10000401T0000Z" "bar\n10000401T0000Z" unfilled box black lightgrey +node "bar.10000501T0000Z" "bar\n10000501T0000Z" unfilled box black lightgrey +node "bar.10000601T0000Z" "bar\n10000601T0000Z" unfilled box black lightgrey +node "bar.10000701T0000Z" "bar\n10000701T0000Z" unfilled box black lightgrey +node "bar.10000801T0000Z" "bar\n10000801T0000Z" unfilled box black lightgrey +node "bar.10000901T0000Z" "bar\n10000901T0000Z" unfilled box black lightgrey +node "bar.10001001T0000Z" "bar\n10001001T0000Z" unfilled box black lightgrey +node "bar.10001101T0000Z" "bar\n10001101T0000Z" unfilled box black lightgrey +node "bar.10001201T0000Z" "bar\n10001201T0000Z" unfilled box black lightgrey +node "bar.10010101T0000Z" "bar\n10010101T0000Z" unfilled box black lightgrey +node "baz.10000101T0000Z" "baz\n10000101T0000Z" unfilled box black lightgrey +node "baz.10000701T0000Z" "baz\n10000701T0000Z" unfilled box black lightgrey +node "baz.10010101T0000Z" "baz\n10010101T0000Z" unfilled box black lightgrey +node "foo.10000101T0000Z" "foo\n10000101T0000Z" unfilled box black lightgrey +node "foo.10000201T0000Z" "foo\n10000201T0000Z" unfilled box black lightgrey +node "foo.10000301T0000Z" "foo\n10000301T0000Z" unfilled box black lightgrey +node "foo.10000401T0000Z" "foo\n10000401T0000Z" unfilled box black lightgrey +node "foo.10000501T0000Z" "foo\n10000501T0000Z" unfilled box black lightgrey +node "foo.10000601T0000Z" "foo\n10000601T0000Z" unfilled box black lightgrey +node "foo.10000701T0000Z" "foo\n10000701T0000Z" unfilled box black lightgrey +node "foo.10000801T0000Z" "foo\n10000801T0000Z" unfilled box black lightgrey +node "foo.10000901T0000Z" "foo\n10000901T0000Z" unfilled box black lightgrey +node "foo.10001001T0000Z" "foo\n10001001T0000Z" unfilled box black lightgrey +node "foo.10001101T0000Z" "foo\n10001101T0000Z" unfilled box black lightgrey +node "foo.10001201T0000Z" "foo\n10001201T0000Z" unfilled box black lightgrey +node "foo.10010101T0000Z" "foo\n10010101T0000Z" unfilled box black lightgrey +node "qux.10000101T0000Z" "qux\n10000101T0000Z" unfilled box black lightgrey +node "qux.10000701T0000Z" "qux\n10000701T0000Z" unfilled box black lightgrey +node "qux.10010101T0000Z" "qux\n10010101T0000Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/multimonthly/suite.rc b/tests/cyclers/multimonthly/suite.rc index 1eec9a3b1e3..7d59ddcb197 100644 --- a/tests/cyclers/multimonthly/suite.rc +++ b/tests/cyclers/multimonthly/suite.rc @@ -13,3 +13,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 1000 + final cycle point = 1001 diff --git a/tests/cyclers/multiweekly/graph.plain.ref b/tests/cyclers/multiweekly/graph.plain.ref new file mode 100644 index 00000000000..d55f9c5c387 --- /dev/null +++ b/tests/cyclers/multiweekly/graph.plain.ref @@ -0,0 +1,32 @@ +edge "baz.09991230T0000Z" "baz.10000120T0000Z" solid black +edge "baz.09991230T0000Z" "qux.09991230T0000Z" solid black +edge "baz.10000120T0000Z" "qux.10000120T0000Z" solid black +edge "foo.09991230T0000Z" "bar.09991230T0000Z" solid black +edge "foo.09991230T0000Z" "foo.10000106T0000Z" solid black +edge "foo.10000106T0000Z" "bar.10000106T0000Z" solid black +edge "foo.10000106T0000Z" "foo.10000113T0000Z" solid black +edge "foo.10000113T0000Z" "bar.10000113T0000Z" solid black +edge "foo.10000113T0000Z" "foo.10000120T0000Z" solid black +edge "foo.10000120T0000Z" "bar.10000120T0000Z" solid black +edge "foo.10000120T0000Z" "foo.10000127T0000Z" solid black +edge "foo.10000127T0000Z" "bar.10000127T0000Z" solid black +edge "foo.10000127T0000Z" "foo.10000203T0000Z" solid black +edge "foo.10000203T0000Z" "bar.10000203T0000Z" solid black +graph +node "bar.09991230T0000Z" "bar\n09991230T0000Z" unfilled box black lightgrey +node "bar.10000106T0000Z" "bar\n10000106T0000Z" unfilled box black lightgrey +node "bar.10000113T0000Z" "bar\n10000113T0000Z" unfilled box black lightgrey +node "bar.10000120T0000Z" "bar\n10000120T0000Z" unfilled box black lightgrey +node "bar.10000127T0000Z" "bar\n10000127T0000Z" unfilled box black lightgrey +node "bar.10000203T0000Z" "bar\n10000203T0000Z" unfilled box black lightgrey +node "baz.09991230T0000Z" "baz\n09991230T0000Z" unfilled box black lightgrey +node "baz.10000120T0000Z" "baz\n10000120T0000Z" unfilled box black lightgrey +node "foo.09991230T0000Z" "foo\n09991230T0000Z" unfilled box black lightgrey +node "foo.10000106T0000Z" "foo\n10000106T0000Z" unfilled box black lightgrey +node "foo.10000113T0000Z" "foo\n10000113T0000Z" unfilled box black lightgrey +node "foo.10000120T0000Z" "foo\n10000120T0000Z" unfilled box black lightgrey +node "foo.10000127T0000Z" "foo\n10000127T0000Z" unfilled box black lightgrey +node "foo.10000203T0000Z" "foo\n10000203T0000Z" unfilled box black lightgrey +node "qux.09991230T0000Z" "qux\n09991230T0000Z" unfilled box black lightgrey +node "qux.10000120T0000Z" "qux\n10000120T0000Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/multiweekly/suite.rc b/tests/cyclers/multiweekly/suite.rc index ad46c3f34d3..8b285168eaf 100644 --- a/tests/cyclers/multiweekly/suite.rc +++ b/tests/cyclers/multiweekly/suite.rc @@ -13,3 +13,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 1000W011 + final cycle point = 1000W064 diff --git a/tests/cyclers/multiyearly/graph.plain.ref b/tests/cyclers/multiyearly/graph.plain.ref new file mode 100644 index 00000000000..f0865957467 --- /dev/null +++ b/tests/cyclers/multiyearly/graph.plain.ref @@ -0,0 +1,52 @@ +edge "baz.10050101T0000Z" "baz.10090101T0000Z" solid black +edge "baz.10050101T0000Z" "qux.10050101T0000Z" solid black +edge "baz.10090101T0000Z" "baz.10130101T0000Z" solid black +edge "baz.10090101T0000Z" "qux.10090101T0000Z" solid black +edge "baz.10130101T0000Z" "qux.10130101T0000Z" solid black +edge "foo.10050101T0000Z" "bar.10050101T0000Z" solid black +edge "foo.10050101T0000Z" "foo.10060101T0000Z" solid black +edge "foo.10060101T0000Z" "bar.10060101T0000Z" solid black +edge "foo.10060101T0000Z" "foo.10070101T0000Z" solid black +edge "foo.10070101T0000Z" "bar.10070101T0000Z" solid black +edge "foo.10070101T0000Z" "foo.10080101T0000Z" solid black +edge "foo.10080101T0000Z" "bar.10080101T0000Z" solid black +edge "foo.10080101T0000Z" "foo.10090101T0000Z" solid black +edge "foo.10090101T0000Z" "bar.10090101T0000Z" solid black +edge "foo.10090101T0000Z" "foo.10100101T0000Z" solid black +edge "foo.10100101T0000Z" "bar.10100101T0000Z" solid black +edge "foo.10100101T0000Z" "foo.10110101T0000Z" solid black +edge "foo.10110101T0000Z" "bar.10110101T0000Z" solid black +edge "foo.10110101T0000Z" "foo.10120101T0000Z" solid black +edge "foo.10120101T0000Z" "bar.10120101T0000Z" solid black +edge "foo.10120101T0000Z" "foo.10130101T0000Z" solid black +edge "foo.10130101T0000Z" "bar.10130101T0000Z" solid black +edge "foo.10130101T0000Z" "foo.10140101T0000Z" solid black +edge "foo.10140101T0000Z" "bar.10140101T0000Z" solid black +graph +node "bar.10050101T0000Z" "bar\n10050101T0000Z" unfilled box black lightgrey +node "bar.10060101T0000Z" "bar\n10060101T0000Z" unfilled box black lightgrey +node "bar.10070101T0000Z" "bar\n10070101T0000Z" unfilled box black lightgrey +node "bar.10080101T0000Z" "bar\n10080101T0000Z" unfilled box black lightgrey +node "bar.10090101T0000Z" "bar\n10090101T0000Z" unfilled box black lightgrey +node "bar.10100101T0000Z" "bar\n10100101T0000Z" unfilled box black lightgrey +node "bar.10110101T0000Z" "bar\n10110101T0000Z" unfilled box black lightgrey +node "bar.10120101T0000Z" "bar\n10120101T0000Z" unfilled box black lightgrey +node "bar.10130101T0000Z" "bar\n10130101T0000Z" unfilled box black lightgrey +node "bar.10140101T0000Z" "bar\n10140101T0000Z" unfilled box black lightgrey +node "baz.10050101T0000Z" "baz\n10050101T0000Z" unfilled box black lightgrey +node "baz.10090101T0000Z" "baz\n10090101T0000Z" unfilled box black lightgrey +node "baz.10130101T0000Z" "baz\n10130101T0000Z" unfilled box black lightgrey +node "foo.10050101T0000Z" "foo\n10050101T0000Z" unfilled box black lightgrey +node "foo.10060101T0000Z" "foo\n10060101T0000Z" unfilled box black lightgrey +node "foo.10070101T0000Z" "foo\n10070101T0000Z" unfilled box black lightgrey +node "foo.10080101T0000Z" "foo\n10080101T0000Z" unfilled box black lightgrey +node "foo.10090101T0000Z" "foo\n10090101T0000Z" unfilled box black lightgrey +node "foo.10100101T0000Z" "foo\n10100101T0000Z" unfilled box black lightgrey +node "foo.10110101T0000Z" "foo\n10110101T0000Z" unfilled box black lightgrey +node "foo.10120101T0000Z" "foo\n10120101T0000Z" unfilled box black lightgrey +node "foo.10130101T0000Z" "foo\n10130101T0000Z" unfilled box black lightgrey +node "foo.10140101T0000Z" "foo\n10140101T0000Z" unfilled box black lightgrey +node "qux.10050101T0000Z" "qux\n10050101T0000Z" unfilled box black lightgrey +node "qux.10090101T0000Z" "qux\n10090101T0000Z" unfilled box black lightgrey +node "qux.10130101T0000Z" "qux\n10130101T0000Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/multiyearly/suite.rc b/tests/cyclers/multiyearly/suite.rc index da1cc6dc002..ee5433514a9 100644 --- a/tests/cyclers/multiyearly/suite.rc +++ b/tests/cyclers/multiyearly/suite.rc @@ -13,3 +13,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 1005 + final cycle point = 1014 diff --git a/tests/cyclers/offset_final/graph.plain.ref b/tests/cyclers/offset_final/graph.plain.ref new file mode 100644 index 00000000000..6dedeecff20 --- /dev/null +++ b/tests/cyclers/offset_final/graph.plain.ref @@ -0,0 +1,5 @@ +edge "bar.20140101T1200Z" "baz.20140101T1200Z" solid black +graph +node "bar.20140101T1200Z" "bar\n20140101T1200Z" unfilled box black lightgrey +node "baz.20140101T1200Z" "baz\n20140101T1200Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/offset_final/suite.rc b/tests/cyclers/offset_final/suite.rc index 49839d97ded..ca638cedde0 100644 --- a/tests/cyclers/offset_final/suite.rc +++ b/tests/cyclers/offset_final/suite.rc @@ -9,3 +9,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20140101 + final cycle point = 20140102T12 diff --git a/tests/cyclers/offset_initial/graph.plain.ref b/tests/cyclers/offset_initial/graph.plain.ref new file mode 100644 index 00000000000..4daafbbd9e3 --- /dev/null +++ b/tests/cyclers/offset_initial/graph.plain.ref @@ -0,0 +1,11 @@ +edge "bar.20140102T0000Z" "baz.20140102T0000Z" solid black +edge "bar.20140102T0600Z" "baz.20140102T0600Z" solid black +edge "bar.20140102T1200Z" "baz.20140102T1200Z" solid black +graph +node "bar.20140102T0000Z" "bar\n20140102T0000Z" unfilled box black lightgrey +node "bar.20140102T0600Z" "bar\n20140102T0600Z" unfilled box black lightgrey +node "bar.20140102T1200Z" "bar\n20140102T1200Z" unfilled box black lightgrey +node "baz.20140102T0000Z" "baz\n20140102T0000Z" unfilled box black lightgrey +node "baz.20140102T0600Z" "baz\n20140102T0600Z" unfilled box black lightgrey +node "baz.20140102T1200Z" "baz\n20140102T1200Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/offset_initial/suite.rc b/tests/cyclers/offset_initial/suite.rc index 876f04b5811..edbefd58a05 100644 --- a/tests/cyclers/offset_initial/suite.rc +++ b/tests/cyclers/offset_initial/suite.rc @@ -9,3 +9,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20140101 + final cycle point = 20140102T12 diff --git a/tests/cyclers/r1_final/graph.plain.ref b/tests/cyclers/r1_final/graph.plain.ref new file mode 100644 index 00000000000..d22a2f058db --- /dev/null +++ b/tests/cyclers/r1_final/graph.plain.ref @@ -0,0 +1,5 @@ +edge "foo.20140102T1200Z" "final_foo.20140102T1200Z" solid black +graph +node "final_foo.20140102T1200Z" "final_foo\n20140102T1200Z" unfilled box black lightgrey +node "foo.20140102T1200Z" "foo\n20140102T1200Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/r1_final/suite.rc b/tests/cyclers/r1_final/suite.rc index 4ba7c77340d..5b6b0dda8a6 100644 --- a/tests/cyclers/r1_final/suite.rc +++ b/tests/cyclers/r1_final/suite.rc @@ -9,3 +9,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20140101 + final cycle point = 20140102T12 diff --git a/tests/cyclers/r1_initial/graph.plain.ref b/tests/cyclers/r1_initial/graph.plain.ref new file mode 100644 index 00000000000..f8c90407699 --- /dev/null +++ b/tests/cyclers/r1_initial/graph.plain.ref @@ -0,0 +1,11 @@ +edge "cold_foo.20140101T0000Z" "foo.20140101T0000Z" solid black +edge "foo.20140101T0000Z" "foo.20140101T1200Z" solid black +edge "foo.20140101T1200Z" "foo.20140102T0000Z" solid black +edge "foo.20140102T0000Z" "foo.20140102T1200Z" solid black +graph +node "cold_foo.20140101T0000Z" "cold_foo\n20140101T0000Z" unfilled box black lightgrey +node "foo.20140101T0000Z" "foo\n20140101T0000Z" unfilled box black lightgrey +node "foo.20140101T1200Z" "foo\n20140101T1200Z" unfilled box black lightgrey +node "foo.20140102T0000Z" "foo\n20140102T0000Z" unfilled box black lightgrey +node "foo.20140102T1200Z" "foo\n20140102T1200Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/r1_initial/suite.rc b/tests/cyclers/r1_initial/suite.rc index bb52bf0930c..1fe70817873 100644 --- a/tests/cyclers/r1_initial/suite.rc +++ b/tests/cyclers/r1_initial/suite.rc @@ -11,3 +11,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20140101 + final cycle point = 20140102T12 diff --git a/tests/cyclers/r1_middle/graph.plain.ref b/tests/cyclers/r1_middle/graph.plain.ref new file mode 100644 index 00000000000..d453777735e --- /dev/null +++ b/tests/cyclers/r1_middle/graph.plain.ref @@ -0,0 +1,5 @@ +edge "foo.20140101T0010Z" "bar.20140101T0010Z" solid black +graph +node "bar.20140101T0010Z" "bar\n20140101T0010Z" unfilled box black lightgrey +node "foo.20140101T0010Z" "foo\n20140101T0010Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/r1_middle/suite.rc b/tests/cyclers/r1_middle/suite.rc index 666a2fc41c6..574cebf8c11 100644 --- a/tests/cyclers/r1_middle/suite.rc +++ b/tests/cyclers/r1_middle/suite.rc @@ -9,3 +9,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20140101 + final cycle point = 20140102T12 diff --git a/tests/cyclers/r1_multi_start/graph.plain.ref b/tests/cyclers/r1_multi_start/graph.plain.ref new file mode 100644 index 00000000000..2884dc226b7 --- /dev/null +++ b/tests/cyclers/r1_multi_start/graph.plain.ref @@ -0,0 +1,17 @@ +edge "cold_foo.20140101T0000Z" "foo_dawn.20140101T0600Z" solid black +edge "cold_foo.20140101T0000Z" "foo_midnight.20140101T0000Z" solid black +edge "foo_dawn.20140101T0600Z" "foo_dawn.20140102T0600Z" solid black +edge "foo_dawn.20140102T0600Z" "foo_dawn.20140103T0600Z" solid black +edge "foo_midnight.20140101T0000Z" "foo_midnight.20140102T0000Z" solid black +edge "foo_midnight.20140102T0000Z" "foo_midnight.20140103T0000Z" solid black +edge "foo_midnight.20140103T0000Z" "foo_midnight.20140104T0000Z" solid black +graph +node "cold_foo.20140101T0000Z" "cold_foo\n20140101T0000Z" unfilled box black lightgrey +node "foo_dawn.20140101T0600Z" "foo_dawn\n20140101T0600Z" unfilled box black lightgrey +node "foo_dawn.20140102T0600Z" "foo_dawn\n20140102T0600Z" unfilled box black lightgrey +node "foo_dawn.20140103T0600Z" "foo_dawn\n20140103T0600Z" unfilled box black lightgrey +node "foo_midnight.20140101T0000Z" "foo_midnight\n20140101T0000Z" unfilled box black lightgrey +node "foo_midnight.20140102T0000Z" "foo_midnight\n20140102T0000Z" unfilled box black lightgrey +node "foo_midnight.20140103T0000Z" "foo_midnight\n20140103T0000Z" unfilled box black lightgrey +node "foo_midnight.20140104T0000Z" "foo_midnight\n20140104T0000Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/r1_multi_start/suite.rc b/tests/cyclers/r1_multi_start/suite.rc index dac32c253d3..9b5fab283ba 100644 --- a/tests/cyclers/r1_multi_start/suite.rc +++ b/tests/cyclers/r1_multi_start/suite.rc @@ -17,3 +17,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 2014-01-01 + final cycle point = 2014-01-04 diff --git a/tests/cyclers/r5_final/graph.plain.ref b/tests/cyclers/r5_final/graph.plain.ref new file mode 100644 index 00000000000..12c8fc7c59c --- /dev/null +++ b/tests/cyclers/r5_final/graph.plain.ref @@ -0,0 +1,17 @@ +edge "xyzzy.20140102T0000Z" "bar.20140102T0000Z" solid black +edge "xyzzy.20140102T0300Z" "bar.20140102T0300Z" solid black +edge "xyzzy.20140102T0600Z" "bar.20140102T0600Z" solid black +edge "xyzzy.20140102T0900Z" "bar.20140102T0900Z" solid black +edge "xyzzy.20140102T1200Z" "bar.20140102T1200Z" solid black +graph +node "bar.20140102T0000Z" "bar\n20140102T0000Z" unfilled box black lightgrey +node "bar.20140102T0300Z" "bar\n20140102T0300Z" unfilled box black lightgrey +node "bar.20140102T0600Z" "bar\n20140102T0600Z" unfilled box black lightgrey +node "bar.20140102T0900Z" "bar\n20140102T0900Z" unfilled box black lightgrey +node "bar.20140102T1200Z" "bar\n20140102T1200Z" unfilled box black lightgrey +node "xyzzy.20140102T0000Z" "xyzzy\n20140102T0000Z" unfilled box black lightgrey +node "xyzzy.20140102T0300Z" "xyzzy\n20140102T0300Z" unfilled box black lightgrey +node "xyzzy.20140102T0600Z" "xyzzy\n20140102T0600Z" unfilled box black lightgrey +node "xyzzy.20140102T0900Z" "xyzzy\n20140102T0900Z" unfilled box black lightgrey +node "xyzzy.20140102T1200Z" "xyzzy\n20140102T1200Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/r5_final/suite.rc b/tests/cyclers/r5_final/suite.rc index 04f7597badd..9d1be0e5955 100644 --- a/tests/cyclers/r5_final/suite.rc +++ b/tests/cyclers/r5_final/suite.rc @@ -9,3 +9,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20140101 + final cycle point = 20140102T12 diff --git a/tests/cyclers/r5_initial/graph.plain.ref b/tests/cyclers/r5_initial/graph.plain.ref new file mode 100644 index 00000000000..cdd75acaf48 --- /dev/null +++ b/tests/cyclers/r5_initial/graph.plain.ref @@ -0,0 +1,17 @@ +edge "xyzzy.20140101T0000Z" "bar.20140101T0000Z" solid black +edge "xyzzy.20140101T0300Z" "bar.20140101T0300Z" solid black +edge "xyzzy.20140101T0600Z" "bar.20140101T0600Z" solid black +edge "xyzzy.20140101T0900Z" "bar.20140101T0900Z" solid black +edge "xyzzy.20140101T1200Z" "bar.20140101T1200Z" solid black +graph +node "bar.20140101T0000Z" "bar\n20140101T0000Z" unfilled box black lightgrey +node "bar.20140101T0300Z" "bar\n20140101T0300Z" unfilled box black lightgrey +node "bar.20140101T0600Z" "bar\n20140101T0600Z" unfilled box black lightgrey +node "bar.20140101T0900Z" "bar\n20140101T0900Z" unfilled box black lightgrey +node "bar.20140101T1200Z" "bar\n20140101T1200Z" unfilled box black lightgrey +node "xyzzy.20140101T0000Z" "xyzzy\n20140101T0000Z" unfilled box black lightgrey +node "xyzzy.20140101T0300Z" "xyzzy\n20140101T0300Z" unfilled box black lightgrey +node "xyzzy.20140101T0600Z" "xyzzy\n20140101T0600Z" unfilled box black lightgrey +node "xyzzy.20140101T0900Z" "xyzzy\n20140101T0900Z" unfilled box black lightgrey +node "xyzzy.20140101T1200Z" "xyzzy\n20140101T1200Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/r5_initial/suite.rc b/tests/cyclers/r5_initial/suite.rc index d3fa1f0e704..8b81ddb08c0 100644 --- a/tests/cyclers/r5_initial/suite.rc +++ b/tests/cyclers/r5_initial/suite.rc @@ -9,3 +9,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20140101 + final cycle point = 20140102T12 diff --git a/tests/cyclers/subhourly/graph.plain.ref b/tests/cyclers/subhourly/graph.plain.ref new file mode 100644 index 00000000000..bbc85e58a54 --- /dev/null +++ b/tests/cyclers/subhourly/graph.plain.ref @@ -0,0 +1,17 @@ +edge "foo.20131231T2300Z" "bar.20131231T2300Z" solid black +edge "foo.20131231T2300Z" "foo.20131231T2330Z" solid black +edge "foo.20131231T2330Z" "bar.20131231T2330Z" solid black +edge "foo.20131231T2330Z" "foo.20140101T0000Z" solid black +edge "foo.20140101T0000Z" "bar.20140101T0000Z" solid black +edge "foo.20140101T0000Z" "foo.20140101T0030Z" solid black +edge "foo.20140101T0030Z" "bar.20140101T0030Z" solid black +graph +node "bar.20131231T2300Z" "bar\n20131231T2300Z" unfilled box black lightgrey +node "bar.20131231T2330Z" "bar\n20131231T2330Z" unfilled box black lightgrey +node "bar.20140101T0000Z" "bar\n20140101T0000Z" unfilled box black lightgrey +node "bar.20140101T0030Z" "bar\n20140101T0030Z" unfilled box black lightgrey +node "foo.20131231T2300Z" "foo\n20131231T2300Z" unfilled box black lightgrey +node "foo.20131231T2330Z" "foo\n20131231T2330Z" unfilled box black lightgrey +node "foo.20140101T0000Z" "foo\n20140101T0000Z" unfilled box black lightgrey +node "foo.20140101T0030Z" "foo\n20140101T0030Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/subhourly/suite.rc b/tests/cyclers/subhourly/suite.rc index aa604dbc31c..a7dd22bff75 100644 --- a/tests/cyclers/subhourly/suite.rc +++ b/tests/cyclers/subhourly/suite.rc @@ -9,3 +9,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 20131231T2300 + final cycle point = 20140101T0050 diff --git a/tests/cyclers/weekly/graph.plain.ref b/tests/cyclers/weekly/graph.plain.ref new file mode 100644 index 00000000000..c61a0a4d4a9 --- /dev/null +++ b/tests/cyclers/weekly/graph.plain.ref @@ -0,0 +1,25 @@ +edge "foo.20050107T1200Z" "bar.20050107T1200Z" solid black +edge "foo.20050107T1200Z" "foo.20050114T1200Z" solid black +edge "foo.20050114T1200Z" "bar.20050114T1200Z" solid black +edge "foo.20050114T1200Z" "foo.20050121T1200Z" solid black +edge "foo.20050121T1200Z" "bar.20050121T1200Z" solid black +edge "foo.20050121T1200Z" "foo.20050128T1200Z" solid black +edge "foo.20050128T1200Z" "bar.20050128T1200Z" solid black +edge "foo.20050128T1200Z" "foo.20050204T1200Z" solid black +edge "foo.20050204T1200Z" "bar.20050204T1200Z" solid black +edge "foo.20050204T1200Z" "foo.20050211T1200Z" solid black +edge "foo.20050211T1200Z" "bar.20050211T1200Z" solid black +graph +node "bar.20050107T1200Z" "bar\n20050107T1200Z" unfilled box black lightgrey +node "bar.20050114T1200Z" "bar\n20050114T1200Z" unfilled box black lightgrey +node "bar.20050121T1200Z" "bar\n20050121T1200Z" unfilled box black lightgrey +node "bar.20050128T1200Z" "bar\n20050128T1200Z" unfilled box black lightgrey +node "bar.20050204T1200Z" "bar\n20050204T1200Z" unfilled box black lightgrey +node "bar.20050211T1200Z" "bar\n20050211T1200Z" unfilled box black lightgrey +node "foo.20050107T1200Z" "foo\n20050107T1200Z" unfilled box black lightgrey +node "foo.20050114T1200Z" "foo\n20050114T1200Z" unfilled box black lightgrey +node "foo.20050121T1200Z" "foo\n20050121T1200Z" unfilled box black lightgrey +node "foo.20050128T1200Z" "foo\n20050128T1200Z" unfilled box black lightgrey +node "foo.20050204T1200Z" "foo\n20050204T1200Z" unfilled box black lightgrey +node "foo.20050211T1200Z" "foo\n20050211T1200Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/weekly/suite.rc b/tests/cyclers/weekly/suite.rc index 7dc21b4d093..081266b6bad 100644 --- a/tests/cyclers/weekly/suite.rc +++ b/tests/cyclers/weekly/suite.rc @@ -9,3 +9,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 2005W015T12 + final cycle point = 2005W065T11-0100 diff --git a/tests/cyclers/yearly/graph.plain.ref b/tests/cyclers/yearly/graph.plain.ref new file mode 100644 index 00000000000..ecebd78c59f --- /dev/null +++ b/tests/cyclers/yearly/graph.plain.ref @@ -0,0 +1,13 @@ +edge "foo.20050123T1200Z" "bar.20050123T1200Z" solid black +edge "foo.20050123T1200Z" "foo.20060123T1200Z" solid black +edge "foo.20060123T1200Z" "bar.20060123T1200Z" solid black +edge "foo.20060123T1200Z" "foo.20070123T1200Z" solid black +edge "foo.20070123T1200Z" "bar.20070123T1200Z" solid black +graph +node "bar.20050123T1200Z" "bar\n20050123T1200Z" unfilled box black lightgrey +node "bar.20060123T1200Z" "bar\n20060123T1200Z" unfilled box black lightgrey +node "bar.20070123T1200Z" "bar\n20070123T1200Z" unfilled box black lightgrey +node "foo.20050123T1200Z" "foo\n20050123T1200Z" unfilled box black lightgrey +node "foo.20060123T1200Z" "foo\n20060123T1200Z" unfilled box black lightgrey +node "foo.20070123T1200Z" "foo\n20070123T1200Z" unfilled box black lightgrey +stop diff --git a/tests/cyclers/yearly/suite.rc b/tests/cyclers/yearly/suite.rc index da12a598987..80f5cf0d47f 100644 --- a/tests/cyclers/yearly/suite.rc +++ b/tests/cyclers/yearly/suite.rc @@ -11,3 +11,6 @@ [runtime] [[root]] command scripting = true +[visualization] + initial cycle point = 2005023T12 + final cycle point = 2008001T11 From 8ef7ddfe92ba8dc8cd36899f83a0038e92aba055 Mon Sep 17 00:00:00 2001 From: Ben Fitzpatrick Date: Mon, 28 Jul 2014 12:07:11 +0100 Subject: [PATCH 4/6] #1008: adjust tests for new start-up/async behaviour --- tests/intercycle/asynch/reference.log | 6 +++--- tests/reload/asynch/reference.log | 2 +- tests/reload/startup/reference.log | 2 +- tests/special/sequential/reference.log | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/intercycle/asynch/reference.log b/tests/intercycle/asynch/reference.log index 485b0285500..9d99e904fbc 100644 --- a/tests/intercycle/asynch/reference.log +++ b/tests/intercycle/asynch/reference.log @@ -57,7 +57,7 @@ 2013/11/15 12:33:38 DEBUG - BEGIN TASK PROCESSING 2013/11/15 12:33:38 INFO - [b.2012010106] -(setting:queued) 2013/11/15 12:33:38 INFO - [b.2012010106] -(setting:submitting) -2013/11/15 12:33:38 INFO - [b.2012010106] -triggered off ['a.2012010100', 'b.2012010100'] +2013/11/15 12:33:38 INFO - [b.2012010106] -triggered off ['b.2012010100'] 2013/11/15 12:33:38 DEBUG - END TASK PROCESSING (took 0.014217 sec) 2013/11/15 12:33:39 DEBUG - Job Submission batch 1/1 (1 members): 2013/11/15 12:33:39 DEBUG - Job Submission: batch completed @@ -81,7 +81,7 @@ 2013/11/15 12:33:42 DEBUG - BEGIN TASK PROCESSING 2013/11/15 12:33:42 INFO - [b.2012010112] -(setting:queued) 2013/11/15 12:33:42 INFO - [b.2012010112] -(setting:submitting) -2013/11/15 12:33:42 INFO - [b.2012010112] -triggered off ['a.2012010100', 'b.2012010106'] +2013/11/15 12:33:42 INFO - [b.2012010112] -triggered off ['b.2012010106'] 2013/11/15 12:33:42 DEBUG - END TASK PROCESSING (took 0.014486 sec) 2013/11/15 12:33:43 DEBUG - Job Submission batch 1/1 (1 members): 2013/11/15 12:33:43 DEBUG - Job Submission: batch completed @@ -105,7 +105,7 @@ 2013/11/15 12:33:46 DEBUG - BEGIN TASK PROCESSING 2013/11/15 12:33:46 INFO - [b.2012010118] -(setting:queued) 2013/11/15 12:33:46 INFO - [b.2012010118] -(setting:submitting) -2013/11/15 12:33:46 INFO - [b.2012010118] -triggered off ['a.2012010100', 'b.2012010112'] +2013/11/15 12:33:46 INFO - [b.2012010118] -triggered off ['b.2012010112'] 2013/11/15 12:33:46 DEBUG - END TASK PROCESSING (took 0.014103 sec) 2013/11/15 12:33:47 DEBUG - Job Submission batch 1/1 (1 members): 2013/11/15 12:33:47 INFO - [b.2012010118] -(current:submitting)> b.2012010118 submitting now diff --git a/tests/reload/asynch/reference.log b/tests/reload/asynch/reference.log index 08cab493fa0..d7b0050c48a 100644 --- a/tests/reload/asynch/reference.log +++ b/tests/reload/asynch/reference.log @@ -40,7 +40,7 @@ 2014-04-25T14:51:13 INFO - [c.2010010100] -(current:submitted)> c.2010010100 submit_method_id=13582 2014-04-25T14:51:14 INFO - [c.2010010100] -(current:submitted)> c.2010010100 started at 2014-04-25T14:51:13 2014-04-25T14:51:14 INFO - [c.2010010100] -(current:running)> c.2010010100 succeeded at 2014-04-25T14:51:13 -2014-04-25T14:51:15 INFO - [a.2010010106] -triggered off ['asynch.2010010100', 'c.2010010100'] +2014-04-25T14:51:15 INFO - [a.2010010106] -triggered off ['c.2010010100'] 2014-04-25T14:51:16 INFO - [a.2010010106] -(current:ready)> a.2010010106 submitting now 2014-04-25T14:51:16 INFO - [a.2010010106] -(current:ready)> a.2010010106 submission succeeded 2014-04-25T14:51:16 INFO - [a.2010010106] -(current:submitted)> a.2010010106 submit_method_id=13771 diff --git a/tests/reload/startup/reference.log b/tests/reload/startup/reference.log index f6e9df7a2d0..afa97518b77 100644 --- a/tests/reload/startup/reference.log +++ b/tests/reload/startup/reference.log @@ -146,7 +146,7 @@ 2013/11/05 11:02:51 DEBUG - BEGIN TASK PROCESSING 2013/11/05 11:02:51 INFO - [a.2010010106] -(setting:queued) 2013/11/05 11:02:51 INFO - [a.2010010106] -(setting:submitting) -2013/11/05 11:02:51 INFO - [a.2010010106] -triggered off ['c.2010010100', 'start.2010010100'] +2013/11/05 11:02:51 INFO - [a.2010010106] -triggered off ['c.2010010100'] 2013/11/05 11:02:51 DEBUG - END TASK PROCESSING (took 0.014616 sec) 2013/11/05 11:02:51 DEBUG - UPDATING STATE SUMMARY 2013/11/05 11:02:51 DEBUG - Job Submission batch 1/1 (1 members): diff --git a/tests/special/sequential/reference.log b/tests/special/sequential/reference.log index cb94b3e9e23..99aaa433b2e 100644 --- a/tests/special/sequential/reference.log +++ b/tests/special/sequential/reference.log @@ -57,7 +57,7 @@ 2014/01/07 16:58:37 DEBUG - [foo.2010010106] -(setting:queued) 2014/01/07 16:58:37 DEBUG - 1 task(s) ready 2014/01/07 16:58:37 DEBUG - [foo.2010010106] -(setting:ready) -2014/01/07 16:58:37 INFO - [foo.2010010106] -triggered off ['foo.2010010100', 'monitor.2010010100'] +2014/01/07 16:58:37 INFO - [foo.2010010106] -triggered off ['foo.2010010100'] 2014/01/07 16:58:37 DEBUG - [foo.2010010100] -task proxy removed 2014/01/07 16:58:37 DEBUG - END TASK PROCESSING (took 0.007193 sec) 2014/01/07 16:58:38 DEBUG - Job Submission batch 1/1 (1 members): @@ -82,7 +82,7 @@ 2014/01/07 16:58:49 DEBUG - [foo.2010010112] -(setting:queued) 2014/01/07 16:58:49 DEBUG - 1 task(s) ready 2014/01/07 16:58:49 DEBUG - [foo.2010010112] -(setting:ready) -2014/01/07 16:58:49 INFO - [foo.2010010112] -triggered off ['foo.2010010106', 'monitor.2010010100'] +2014/01/07 16:58:49 INFO - [foo.2010010112] -triggered off ['foo.2010010106'] 2014/01/07 16:58:49 DEBUG - [foo.2010010106] -task proxy removed 2014/01/07 16:58:49 DEBUG - END TASK PROCESSING (took 0.007156 sec) 2014/01/07 16:58:50 DEBUG - Job Submission batch 1/1 (1 members): @@ -107,7 +107,7 @@ 2014/01/07 16:59:01 DEBUG - [foo.2010010118] -(setting:queued) 2014/01/07 16:59:01 DEBUG - 1 task(s) ready 2014/01/07 16:59:01 DEBUG - [foo.2010010118] -(setting:ready) -2014/01/07 16:59:01 INFO - [foo.2010010118] -triggered off ['foo.2010010112', 'monitor.2010010100'] +2014/01/07 16:59:01 INFO - [foo.2010010118] -triggered off ['foo.2010010112'] 2014/01/07 16:59:02 DEBUG - [foo.2010010112] -task proxy removed 2014/01/07 16:59:02 DEBUG - END TASK PROCESSING (took 0.012032 sec) 2014/01/07 16:59:02 DEBUG - Job Submission batch 1/1 (1 members): From dd85c27a215b3b334780e9ee1d17c0d8dbf30893 Mon Sep 17 00:00:00 2001 From: Ben Fitzpatrick Date: Mon, 28 Jul 2014 12:29:38 +0100 Subject: [PATCH 5/6] #1008: remove debug statements --- lib/cylc/config.py | 1 - tests/cyclers/00-daily.t | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/cylc/config.py b/lib/cylc/config.py index 74934ef5f05..83f9d2256a8 100644 --- a/lib/cylc/config.py +++ b/lib/cylc/config.py @@ -1468,7 +1468,6 @@ def get_graph_raw( self, start_ctime_str, stop_str, raw=False, startup_exclude_list = self.get_coldstart_task_list() stop = get_point( stop_str ) - print "stop:", stop for e in self.edges: # Get initial cycle point for this sequence diff --git a/tests/cyclers/00-daily.t b/tests/cyclers/00-daily.t index 0a9987a7b28..ff17702669e 100644 --- a/tests/cyclers/00-daily.t +++ b/tests/cyclers/00-daily.t @@ -29,7 +29,6 @@ run_ok $TEST_NAME cylc validate "$SUITE_NAME" TEST_NAME=$TEST_NAME_BASE-graph graph_suite "$SUITE_NAME" "$SUITE_NAME.graph.plain" cmp_ok "$SUITE_NAME.graph.plain" "$TEST_SOURCE_DIR/$CHOSEN_SUITE/graph.plain.ref" -xxdiff -D "$SUITE_NAME.graph.plain" "$TEST_SOURCE_DIR/$CHOSEN_SUITE/graph.plain.ref" #------------------------------------------------------------------------------- TEST_NAME=$TEST_NAME_BASE-run suite_run_ok $TEST_NAME cylc run --reference-test --debug $SUITE_NAME From 5118a9c3d563ae2c4cedd1f35d56545d6405d07e Mon Sep 17 00:00:00 2001 From: Ben Fitzpatrick Date: Mon, 28 Jul 2014 12:30:42 +0100 Subject: [PATCH 6/6] #1008: remove another debug statement --- tests/lib/bash/test_header | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lib/bash/test_header b/tests/lib/bash/test_header index f516d41095e..df712a35439 100644 --- a/tests/lib/bash/test_header +++ b/tests/lib/bash/test_header @@ -241,7 +241,6 @@ function graph_suite() { SUITE_NAME=$1 OUTPUT_FILE=$2 shift 2 - echo "$@" >/dev/tty TEMP_OUTPUT_FILE=$(mktemp XXXX-$(basename $OUTPUT_FILE)) cylc graph --output-file="$TEMP_OUTPUT_FILE" "$SUITE_NAME" "$@" sed -i "s/[.0-9]\+\( \|$\)//g" "$TEMP_OUTPUT_FILE"