diff --git a/tools/regression.dates.exp b/tools/regression.dates.exp
index 83a9e0c32d..2e8f64efa3 100644
--- a/tools/regression.dates.exp
+++ b/tools/regression.dates.exp
@@ -1,236 +1,242 @@
+=#=#=#= Begin test: 2014-01-01 00:30:00 - 1 Hour =#=#=#=
+Date: 2014-01-01 00:30:00Z
+Duration: -3600 seconds ( 1 hour )
+Duration ends at: 2013-12-31 23:30:00Z
+=#=#=#= End test: 2014-01-01 00:30:00 - 1 Hour - OK (0) =#=#=#=
+* Passed: iso8601        - 2014-01-01 00:30:00 - 1 Hour
 =#=#=#= Begin test: 2006-W01-7 =#=#=#=
 Date: 2006-01-08 00:00:00Z
 =#=#=#= End test: 2006-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2006-W01-7
 =#=#=#= Begin test: 2006-W01-7 - round-trip =#=#=#=
 Date: 2006-W01-7 00:00:00Z
 =#=#=#= End test: 2006-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2006-W01-7 - round-trip
 =#=#=#= Begin test: 2006-W01-1 =#=#=#=
 Date: 2006-01-02 00:00:00Z
 =#=#=#= End test: 2006-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2006-W01-1
 =#=#=#= Begin test: 2006-W01-1 - round-trip =#=#=#=
 Date: 2006-W01-1 00:00:00Z
 =#=#=#= End test: 2006-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2006-W01-1 - round-trip
 =#=#=#= Begin test: 2007-W01-7 =#=#=#=
 Date: 2007-01-07 00:00:00Z
 =#=#=#= End test: 2007-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2007-W01-7
 =#=#=#= Begin test: 2007-W01-7 - round-trip =#=#=#=
 Date: 2007-W01-7 00:00:00Z
 =#=#=#= End test: 2007-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2007-W01-7 - round-trip
 =#=#=#= Begin test: 2007-W01-1 =#=#=#=
 Date: 2007-01-01 00:00:00Z
 =#=#=#= End test: 2007-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2007-W01-1
 =#=#=#= Begin test: 2007-W01-1 - round-trip =#=#=#=
 Date: 2007-W01-1 00:00:00Z
 =#=#=#= End test: 2007-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2007-W01-1 - round-trip
 =#=#=#= Begin test: 2008-W01-7 =#=#=#=
 Date: 2008-01-06 00:00:00Z
 =#=#=#= End test: 2008-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2008-W01-7
 =#=#=#= Begin test: 2008-W01-7 - round-trip =#=#=#=
 Date: 2008-W01-7 00:00:00Z
 =#=#=#= End test: 2008-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2008-W01-7 - round-trip
 =#=#=#= Begin test: 2008-W01-1 =#=#=#=
 Date: 2007-12-31 00:00:00Z
 =#=#=#= End test: 2008-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2008-W01-1
 =#=#=#= Begin test: 2008-W01-1 - round-trip =#=#=#=
 Date: 2008-W01-1 00:00:00Z
 =#=#=#= End test: 2008-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2008-W01-1 - round-trip
 =#=#=#= Begin test: 2009-W01-7 =#=#=#=
 Date: 2009-01-04 00:00:00Z
 =#=#=#= End test: 2009-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2009-W01-7
 =#=#=#= Begin test: 2009-W01-7 - round-trip =#=#=#=
 Date: 2009-W01-7 00:00:00Z
 =#=#=#= End test: 2009-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2009-W01-7 - round-trip
 =#=#=#= Begin test: 2009-W01-1 =#=#=#=
 Date: 2008-12-29 00:00:00Z
 =#=#=#= End test: 2009-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2009-W01-1
 =#=#=#= Begin test: 2009-W01-1 - round-trip =#=#=#=
 Date: 2009-W01-1 00:00:00Z
 =#=#=#= End test: 2009-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2009-W01-1 - round-trip
 =#=#=#= Begin test: 2010-W01-7 =#=#=#=
 Date: 2010-01-10 00:00:00Z
 =#=#=#= End test: 2010-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2010-W01-7
 =#=#=#= Begin test: 2010-W01-7 - round-trip =#=#=#=
 Date: 2010-W01-7 00:00:00Z
 =#=#=#= End test: 2010-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2010-W01-7 - round-trip
 =#=#=#= Begin test: 2010-W01-1 =#=#=#=
 Date: 2010-01-04 00:00:00Z
 =#=#=#= End test: 2010-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2010-W01-1
 =#=#=#= Begin test: 2010-W01-1 - round-trip =#=#=#=
 Date: 2010-W01-1 00:00:00Z
 =#=#=#= End test: 2010-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2010-W01-1 - round-trip
 =#=#=#= Begin test: 2011-W01-7 =#=#=#=
 Date: 2011-01-09 00:00:00Z
 =#=#=#= End test: 2011-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2011-W01-7
 =#=#=#= Begin test: 2011-W01-7 - round-trip =#=#=#=
 Date: 2011-W01-7 00:00:00Z
 =#=#=#= End test: 2011-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2011-W01-7 - round-trip
 =#=#=#= Begin test: 2011-W01-1 =#=#=#=
 Date: 2011-01-03 00:00:00Z
 =#=#=#= End test: 2011-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2011-W01-1
 =#=#=#= Begin test: 2011-W01-1 - round-trip =#=#=#=
 Date: 2011-W01-1 00:00:00Z
 =#=#=#= End test: 2011-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2011-W01-1 - round-trip
 =#=#=#= Begin test: 2012-W01-7 =#=#=#=
 Date: 2012-01-08 00:00:00Z
 =#=#=#= End test: 2012-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2012-W01-7
 =#=#=#= Begin test: 2012-W01-7 - round-trip =#=#=#=
 Date: 2012-W01-7 00:00:00Z
 =#=#=#= End test: 2012-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2012-W01-7 - round-trip
 =#=#=#= Begin test: 2012-W01-1 =#=#=#=
 Date: 2012-01-02 00:00:00Z
 =#=#=#= End test: 2012-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2012-W01-1
 =#=#=#= Begin test: 2012-W01-1 - round-trip =#=#=#=
 Date: 2012-W01-1 00:00:00Z
 =#=#=#= End test: 2012-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2012-W01-1 - round-trip
 =#=#=#= Begin test: 2013-W01-7 =#=#=#=
 Date: 2013-01-06 00:00:00Z
 =#=#=#= End test: 2013-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2013-W01-7
 =#=#=#= Begin test: 2013-W01-7 - round-trip =#=#=#=
 Date: 2013-W01-7 00:00:00Z
 =#=#=#= End test: 2013-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2013-W01-7 - round-trip
 =#=#=#= Begin test: 2013-W01-1 =#=#=#=
 Date: 2012-12-31 00:00:00Z
 =#=#=#= End test: 2013-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2013-W01-1
 =#=#=#= Begin test: 2013-W01-1 - round-trip =#=#=#=
 Date: 2013-W01-1 00:00:00Z
 =#=#=#= End test: 2013-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2013-W01-1 - round-trip
 =#=#=#= Begin test: 2014-W01-7 =#=#=#=
 Date: 2014-01-05 00:00:00Z
 =#=#=#= End test: 2014-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2014-W01-7
 =#=#=#= Begin test: 2014-W01-7 - round-trip =#=#=#=
 Date: 2014-W01-7 00:00:00Z
 =#=#=#= End test: 2014-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2014-W01-7 - round-trip
 =#=#=#= Begin test: 2014-W01-1 =#=#=#=
 Date: 2013-12-30 00:00:00Z
 =#=#=#= End test: 2014-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2014-W01-1
 =#=#=#= Begin test: 2014-W01-1 - round-trip =#=#=#=
 Date: 2014-W01-1 00:00:00Z
 =#=#=#= End test: 2014-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2014-W01-1 - round-trip
 =#=#=#= Begin test: 2015-W01-7 =#=#=#=
 Date: 2015-01-04 00:00:00Z
 =#=#=#= End test: 2015-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2015-W01-7
 =#=#=#= Begin test: 2015-W01-7 - round-trip =#=#=#=
 Date: 2015-W01-7 00:00:00Z
 =#=#=#= End test: 2015-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2015-W01-7 - round-trip
 =#=#=#= Begin test: 2015-W01-1 =#=#=#=
 Date: 2014-12-29 00:00:00Z
 =#=#=#= End test: 2015-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2015-W01-1
 =#=#=#= Begin test: 2015-W01-1 - round-trip =#=#=#=
 Date: 2015-W01-1 00:00:00Z
 =#=#=#= End test: 2015-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2015-W01-1 - round-trip
 =#=#=#= Begin test: 2016-W01-7 =#=#=#=
 Date: 2016-01-10 00:00:00Z
 =#=#=#= End test: 2016-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2016-W01-7
 =#=#=#= Begin test: 2016-W01-7 - round-trip =#=#=#=
 Date: 2016-W01-7 00:00:00Z
 =#=#=#= End test: 2016-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2016-W01-7 - round-trip
 =#=#=#= Begin test: 2016-W01-1 =#=#=#=
 Date: 2016-01-04 00:00:00Z
 =#=#=#= End test: 2016-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2016-W01-1
 =#=#=#= Begin test: 2016-W01-1 - round-trip =#=#=#=
 Date: 2016-W01-1 00:00:00Z
 =#=#=#= End test: 2016-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2016-W01-1 - round-trip
 =#=#=#= Begin test: 2017-W01-7 =#=#=#=
 Date: 2017-01-08 00:00:00Z
 =#=#=#= End test: 2017-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2017-W01-7
 =#=#=#= Begin test: 2017-W01-7 - round-trip =#=#=#=
 Date: 2017-W01-7 00:00:00Z
 =#=#=#= End test: 2017-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2017-W01-7 - round-trip
 =#=#=#= Begin test: 2017-W01-1 =#=#=#=
 Date: 2017-01-02 00:00:00Z
 =#=#=#= End test: 2017-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2017-W01-1
 =#=#=#= Begin test: 2017-W01-1 - round-trip =#=#=#=
 Date: 2017-W01-1 00:00:00Z
 =#=#=#= End test: 2017-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2017-W01-1 - round-trip
 =#=#=#= Begin test: 2018-W01-7 =#=#=#=
 Date: 2018-01-07 00:00:00Z
 =#=#=#= End test: 2018-W01-7 - OK (0) =#=#=#=
 * Passed: iso8601        - 2018-W01-7
 =#=#=#= Begin test: 2018-W01-7 - round-trip =#=#=#=
 Date: 2018-W01-7 00:00:00Z
 =#=#=#= End test: 2018-W01-7 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2018-W01-7 - round-trip
 =#=#=#= Begin test: 2018-W01-1 =#=#=#=
 Date: 2018-01-01 00:00:00Z
 =#=#=#= End test: 2018-W01-1 - OK (0) =#=#=#=
 * Passed: iso8601        - 2018-W01-1
 =#=#=#= Begin test: 2018-W01-1 - round-trip =#=#=#=
 Date: 2018-W01-1 00:00:00Z
 =#=#=#= End test: 2018-W01-1 - round-trip - OK (0) =#=#=#=
 * Passed: iso8601        - 2018-W01-1 - round-trip
 =#=#=#= Begin test: 2009-W53-07 =#=#=#=
 Date: 2009-W53-7 00:00:00Z
 =#=#=#= End test: 2009-W53-07 - OK (0) =#=#=#=
 * Passed: iso8601        - 2009-W53-07
 =#=#=#= Begin test: 2009-01-31 + 1 Month =#=#=#=
 Date: 2009-01-31 00:00:00Z
-Duration: 0000-01-00 00:00:00Z
+Duration:  1 month 
 Duration ends at: 2009-02-28 00:00:00Z
 =#=#=#= End test: 2009-01-31 + 1 Month - OK (0) =#=#=#=
 * Passed: iso8601        - 2009-01-31 + 1 Month
 =#=#=#= Begin test: 2009-01-31 + 2 Months =#=#=#=
 Date: 2009-01-31 00:00:00Z
-Duration: 0000-02-00 00:00:00Z
+Duration:  2 months 
 Duration ends at: 2009-03-31 00:00:00Z
 =#=#=#= End test: 2009-01-31 + 2 Months - OK (0) =#=#=#=
 * Passed: iso8601        - 2009-01-31 + 2 Months
 =#=#=#= Begin test: 2009-01-31 + 3 Months =#=#=#=
 Date: 2009-01-31 00:00:00Z
-Duration: 0000-03-00 00:00:00Z
+Duration:  3 months 
 Duration ends at: 2009-04-30 00:00:00Z
 =#=#=#= End test: 2009-01-31 + 3 Months - OK (0) =#=#=#=
 * Passed: iso8601        - 2009-01-31 + 3 Months
 =#=#=#= Begin test: 2009-03-31 - 1 Month =#=#=#=
 Date: 2009-03-31 00:00:00Z
-Duration: 0000--01-00 00:00:00Z
+Duration: -1 month 
 Duration ends at: 2009-02-28 00:00:00Z
 =#=#=#= End test: 2009-03-31 - 1 Month - OK (0) =#=#=#=
 * Passed: iso8601        - 2009-03-31 - 1 Month
diff --git a/tools/regression.sh b/tools/regression.sh
index a70445ed40..9f290eac2a 100755
--- a/tools/regression.sh
+++ b/tools/regression.sh
@@ -1,618 +1,622 @@
 #!/bin/bash
 
 : ${shadow=tools-regression}
 test_home=`dirname $0`
 num_errors=0
 num_passed=0
 GREP_OPTIONS=
 verbose=0
 tests="dates tools acls"
 
 function test_assert() {
     target=$1; shift
     cib=$1; shift
     app=`echo "$cmd" | sed 's/\ .*//'`
     printf "* Running: $app - $desc\n" 1>&2
 
     printf "=#=#=#= Begin test: $desc =#=#=#=\n"
     eval $VALGRIND_CMD $cmd 2>&1
     rc=$?
 
     if [ x$cib != x0 ]; then
 	printf "=#=#=#= Current cib after: $desc =#=#=#=\n"
 	CIB_user=root cibadmin -Q
     fi
 
     printf "=#=#=#= End test: $desc - `crm_error $rc` ($rc) =#=#=#=\n"
 
     if [ $rc -ne $target ]; then
 	num_errors=`expr $num_errors + 1`
 	printf "* Failed (rc=%.3d): %-14s - %s\n" $rc $app "$desc"
 	printf "* Failed (rc=%.3d): %-14s - %s\n" $rc $app "$desc (`which $app`)" 1>&2
 	return
 	exit 1
     else
 	printf "* Passed: %-14s - %s\n" $app "$desc"
 
 	num_passed=`expr $num_passed + 1`
     fi
 }
 
 function usage() {
     echo "Usage: ./regression.sh [-s(ave)] [-x] [-v(erbose)]"
     exit $1
 }
 
 done=0
 do_save=0
 VALGRIND_CMD=
 while test "$done" = "0"; do
     case "$1" in
 	-t) tests=$2; shift; shift;;
 	-V|--verbose) verbose=1; shift;;
 	-v|--valgrind)
 	    export G_SLICE=always-malloc
 	    VALGRIND_CMD="valgrind -q --gen-suppressions=all --show-reachable=no --leak-check=full --trace-children=no --time-stamp=yes --num-callers=20 --suppressions=/usr/share/pacemaker/tests/valgrind-pcmk.suppressions"
 	    shift;;
 	-x) set -x; shift;;
 	-s) do_save=1; shift;;
 	-p) PATH="$2:$PATH"; export PATH; shift 1;;
 	-?) usage 0;;
 	-*) echo "unknown option: $1"; usage 1;;
 	*) done=1;;
     esac
 done
 
 if [ "x$VALGRIND_CMD" = "x" -a -x $test_home/crm_simulate ]; then
     xml_home=`dirname ${test_home}`
     echo "Using local binaries from: $test_home, schemas from $xml_home"
     export PATH="$test_home:$PATH"
     export PCMK_schema_directory=${xml_home}/xml
 fi
 
 function test_tools() {
     export CIB_shadow_dir=$test_home
     $VALGRIND_CMD crm_shadow --batch --force --create-empty $shadow  2>&1
     export CIB_shadow=$shadow
 
     desc="Validate CIB"
     cmd="cibadmin -Q"
     test_assert 0
 
     desc="Configure something before erasing"
     cmd="crm_attribute -n cluster-delay -v 60s"
     test_assert 0
 
     desc="Require --force for CIB erasure"
     cmd="cibadmin -E"
     test_assert 22
 
     desc="Allow CIB erasure with --force"
     cmd="cibadmin -E --force"
     test_assert 0
 
     desc="Query CIB"
     cmd="cibadmin -Q > /tmp/$$.existing.xml"
     test_assert 0
 
     desc="Set cluster option"
     cmd="crm_attribute -n cluster-delay -v 60s"
     test_assert 0
 
     desc="Query new cluster option"
     cmd="cibadmin -Q -o crm_config | grep cib-bootstrap-options-cluster-delay"
     test_assert 0
 
     desc="Query cluster options"
     cmd="cibadmin -Q -o crm_config > /tmp/$$.opt.xml"
     test_assert 0
 
     desc="Set no-quorum policy"
     cmd="crm_attribute -n no-quorum-policy -v ignore"
     test_assert 0
 
     desc="Delete nvpair"
     cmd="cibadmin -D -o crm_config --xml-text '<nvpair id=\"cib-bootstrap-options-cluster-delay\"/>'"
     test_assert 0
 
     desc="Create operaton should fail"
     cmd="cibadmin -C -o crm_config --xml-file /tmp/$$.opt.xml"
     test_assert 76
 
     desc="Modify cluster options section"
     cmd="cibadmin -M -o crm_config --xml-file /tmp/$$.opt.xml"
     test_assert 0
 
     desc="Query updated cluster option"
     cmd="cibadmin -Q -o crm_config | grep cib-bootstrap-options-cluster-delay"
     test_assert 0
 
     desc="Set duplicate cluster option"
     cmd="crm_attribute -n cluster-delay -v 40s -s duplicate"
     test_assert 0
 
     desc="Setting multiply defined cluster option should fail"
     cmd="crm_attribute -n cluster-delay -v 30s"
     test_assert 76
 
     desc="Set cluster option with -s"
     cmd="crm_attribute -n cluster-delay -v 30s -s duplicate"
     test_assert 0
 
     desc="Delete cluster option with -i"
     cmd="crm_attribute -n cluster-delay -D -i cib-bootstrap-options-cluster-delay"
     test_assert 0
 
     desc="Create node1 and bring it online"
     cmd="crm_simulate --live-check --in-place --node-up=node1"
     test_assert 0
 
     desc="Create node attribute"
     cmd="crm_attribute -n ram -v 1024M -U node1 -t nodes"
     test_assert 0
 
     desc="Query new node attribute"
     cmd="cibadmin -Q -o nodes | grep node1-ram"
     test_assert 0
 
     desc="Digest calculation"
     cmd="cibadmin -Q | cibadmin -5 -p 2>&1 > /dev/null"
     test_assert 0
 
     # This update will fail because it has version numbers
     desc="Replace operation should fail"
     cmd="cibadmin -R --xml-file /tmp/$$.existing.xml"
     test_assert 205
 
     desc="Default standby value"
     cmd="crm_standby -N node1 -G"
     test_assert 0
  
     desc="Set standby status"
     cmd="crm_standby -N node1 -v true"
     test_assert 0
  
     desc="Query standby value"
     cmd="crm_standby -N node1 -G"
     test_assert 0
  
     desc="Delete standby value"
     cmd="crm_standby -N node1 -D"
     test_assert 0
 
     desc="Create a resource"
     cmd="cibadmin -C -o resources --xml-text '<primitive id=\"dummy\" class=\"ocf\" provider=\"pacemaker\" type=\"Dummy\"/>'"
     test_assert 0
 
     desc="Create a resource meta attribute"
     cmd="crm_resource -r dummy --meta -p is-managed -v false"
     test_assert 0
 
     desc="Query a resource meta attribute"
     cmd="crm_resource -r dummy --meta -g is-managed"
     test_assert 0
 
     desc="Remove a resource meta attribute"
     cmd="crm_resource -r dummy --meta -d is-managed"
     test_assert 0
 
     desc="Create a resource attribute"
     cmd="crm_resource -r dummy -p delay -v 10s"
     test_assert 0
 
     desc="List the configured resources"
     cmd="crm_resource -L"
     test_assert 0
 
     desc="Set a resource's fail-count"
     cmd="crm_failcount -r dummy -v 10 -N node1"
     test_assert 0
 
     desc="Require a destination when migrating a resource that is stopped"
     cmd="crm_resource -r dummy -M"
     test_assert 22
 
     desc="Don't support migration to non-existant locations"
     cmd="crm_resource -r dummy -M -N i.dont.exist"
     test_assert 6
 
     desc="Create a fencing resource"
     cmd="cibadmin -C -o resources --xml-text '<primitive id=\"Fence\" class=\"stonith\" type=\"fence_true\"/>'"
     test_assert 0
 
     desc="Bring resources online"
     cmd="crm_simulate --live-check --in-place -S"
     test_assert 0
 
     desc="Try to move a resource to its existing location"
     cmd="crm_resource -r dummy --move --host node1"
     test_assert 22
 
     desc="Move a resource from its existing location"
     cmd="crm_resource -r dummy --move"
     test_assert 0
 
     desc="Clear out constraints generated by --move"
     cmd="crm_resource -r dummy --clear"
     test_assert 0
 
     desc="Default ticket granted state"
     cmd="crm_ticket -t ticketA -G granted -d false"
     test_assert 0
 
     desc="Set ticket granted state"
     cmd="crm_ticket -t ticketA -r --force"
     test_assert 0
 
     desc="Query ticket granted state"
     cmd="crm_ticket -t ticketA -G granted"
     test_assert 0
 
     desc="Delete ticket granted state"
     cmd="crm_ticket -t ticketA -D granted --force"
     test_assert 0
 
     desc="Make a ticket standby"
     cmd="crm_ticket -t ticketA -s"
     test_assert 0
 
     desc="Query ticket standby state"
     cmd="crm_ticket -t ticketA -G standby"
     test_assert 0
 
     desc="Activate a ticket"
     cmd="crm_ticket -t ticketA -a"
     test_assert 0
 
     desc="Delete ticket standby state"
     cmd="crm_ticket -t ticketA -D standby"
     test_assert 0
 
     desc="Ban a resource on unknown node"
     cmd="crm_resource -r dummy -B -N host1"
     test_assert 6
 
     desc="Create two more nodes and bring them online"
     cmd="crm_simulate --live-check --in-place --node-up=node2 --node-up=node3"
     test_assert 0
 
     desc="Ban dummy from node1"
     cmd="crm_resource -r dummy -B -N node1"
     test_assert 0
 
     desc="Ban dummy from node2"
     cmd="crm_resource -r dummy -B -N node2"
     test_assert 0
 
     desc="Relocate resources due to ban"
     cmd="crm_simulate --live-check --in-place -S"
     test_assert 0
 
     desc="Move dummy to node1"
     cmd="crm_resource -r dummy -M -N node1"
     test_assert 0
 
     desc="Clear implicit constraints for dummy on node2"
     cmd="crm_resource -r dummy -U -N node2"
     test_assert 0
  }
 
 function test_dates() {
+    desc="2014-01-01 00:30:00 - 1 Hour"
+    cmd="iso8601 -d '2014-01-01 00:30:00Z' -D P-1H -E '2013-12-31 23:30:00Z'"
+    test_assert 0 0
+
     for y in 06 07 08 09 10 11 12 13 14 15 16 17 18; do
 	desc="20$y-W01-7"
 	cmd="iso8601 -d '20$y-W01-7 00Z'"
 	test_assert 0 0
 
 	desc="20$y-W01-7 - round-trip"
 	cmd="iso8601 -d '20$y-W01-7 00Z' -W -E '20$y-W01-7 00:00:00Z'"
 	test_assert 0 0
 
 	desc="20$y-W01-1"
 	cmd="iso8601 -d '20$y-W01-1 00Z'"
 	test_assert 0 0
 
 	desc="20$y-W01-1 - round-trip"
 	cmd="iso8601 -d '20$y-W01-1 00Z' -W -E '20$y-W01-1 00:00:00Z'"
 	test_assert 0 0
     done
 
     desc="2009-W53-07"
     cmd="iso8601 -d '2009-W53-7 00:00:00Z' -W -E '2009-W53-7 00:00:00Z'"
     test_assert 0 0
 
     desc="2009-01-31 + 1 Month"
     cmd="iso8601 -d '2009-01-31 00:00:00Z' -D P1M -E '2009-02-28 00:00:00Z'"
     test_assert 0 0
 
     desc="2009-01-31 + 2 Months"
     cmd="iso8601 -d '2009-01-31 00:00:00Z' -D P2M -E '2009-03-31 00:00:00Z'"
     test_assert 0 0
 
     desc="2009-01-31 + 3 Months"
     cmd="iso8601 -d '2009-01-31 00:00:00Z' -D P3M -E '2009-04-30 00:00:00Z'"
     test_assert 0 0
 
     desc="2009-03-31 - 1 Month"
     cmd="iso8601 -d '2009-03-31 00:00:00Z' -D P-1M -E '2009-02-28 00:00:00Z'"
     test_assert 0 0
 }
 
 function get_epoch() {
     CIB_user=root CIB_file=$1 CIB_shadow="" cibadmin -Q | head -n 1 | sed -e 's/.* epoch=\"\([0-9]*\).*/\1/'
 }
 
 function restore_epoch() {
     infile=$1; shift
     old=$1; shift
     new=$(get_epoch $infile)
     
     sed -i 's/epoch=.$old/epoch=\"$new/g' $infile
 }
 
 function test_acl_loop() {
     # Make sure we're rejecting things for the right reasons
     export PCMK_trace_functions=__xml_acl_check,__xml_acl_post_process
     export PCMK_stderr=1
 
     CIB_user=root cibadmin --replace --xml-text '<resources/>'
 
     export CIB_user=unknownguy
     desc="$CIB_user: Query configuration"
     cmd="cibadmin -Q"
     test_assert 13 0
 
     desc="$CIB_user: Set enable-acl"
     cmd="crm_attribute -n enable-acl -v false"
     test_assert 13 0
 
     desc="$CIB_user: Set stonith-enabled"
     cmd="crm_attribute -n stonith-enabled -v false"
     test_assert 13 0
 
     desc="$CIB_user: Create a resource"
     cmd="cibadmin -C -o resources --xml-text '<primitive id=\"dummy\" class=\"ocf\" provider=\"pacemaker\" type=\"Dummy\"/>'"
     test_assert 13 0
 
     export CIB_user=l33t-haxor
     desc="$CIB_user: Query configuration"
     cmd="cibadmin -Q"
     test_assert 13 0
 
     desc="$CIB_user: Set enable-acl"
     cmd="crm_attribute -n enable-acl -v false"
     test_assert 13 0
 
     desc="$CIB_user: Set stonith-enabled"
     cmd="crm_attribute -n stonith-enabled -v false"
     test_assert 13 0
 
     desc="$CIB_user: Create a resource"
     cmd="cibadmin -C -o resources --xml-text '<primitive id=\"dummy\" class=\"ocf\" provider=\"pacemaker\" type=\"Dummy\"/>'"
     test_assert 13 0
 
     export CIB_user=niceguy
     desc="$CIB_user: Query configuration"
     cmd="cibadmin -Q"
     test_assert 0 0
 
     desc="$CIB_user: Set enable-acl"
     cmd="crm_attribute -n enable-acl -v false"
     test_assert 13 0
 
     desc="$CIB_user: Set stonith-enabled"
     cmd="crm_attribute -n stonith-enabled -v false"
     test_assert 0
 
     desc="$CIB_user: Create a resource"
     cmd="cibadmin -C -o resources --xml-text '<primitive id=\"dummy\" class=\"ocf\" provider=\"pacemaker\" type=\"Dummy\"/>'"
     test_assert 13 0
 
     export CIB_user=root
     desc="$CIB_user: Query configuration"
     cmd="cibadmin -Q"
     test_assert 0 0
 
     desc="$CIB_user: Set stonith-enabled"
     cmd="crm_attribute -n stonith-enabled -v true"
     test_assert 0
 
     desc="$CIB_user: Create a resource"
     cmd="cibadmin -C -o resources --xml-text '<primitive id=\"dummy\" class=\"ocf\" provider=\"pacemaker\" type=\"Dummy\"/>'"
     test_assert 0
 
     export CIB_user=l33t-haxor
 
     desc="$CIB_user: Create a resource meta attribute"
     cmd="crm_resource -r dummy --meta -p target-role -v Stopped"
     test_assert 13 0
 
     desc="$CIB_user: Query a resource meta attribute"
     cmd="crm_resource -r dummy --meta -g target-role"
     test_assert 13 0
 
     desc="$CIB_user: Remove a resource meta attribute"
     cmd="crm_resource -r dummy --meta -d target-role"
     test_assert 13 0
 
     export CIB_user=niceguy
 
     desc="$CIB_user: Create a resource meta attribute"
     cmd="crm_resource -r dummy --meta -p target-role -v Stopped"
     test_assert 0
 
     desc="$CIB_user: Query a resource meta attribute"
     cmd="crm_resource -r dummy --meta -g target-role"
     test_assert 0
 
     desc="$CIB_user: Remove a resource meta attribute"
     cmd="crm_resource -r dummy --meta -d target-role"
     test_assert 0
 
     desc="$CIB_user: Create a resource meta attribute"
     cmd="crm_resource -r dummy --meta -p target-role -v Started"
     test_assert 0
 
     export CIB_user=badidea
     desc="$CIB_user: Query configuration - implied deny"
     cmd="cibadmin -Q"
     test_assert 0 0
 
     export CIB_user=betteridea
     desc="$CIB_user: Query configuration - explicit deny"
     cmd="cibadmin -Q"
     test_assert 0 0
 
     CIB_user=root cibadmin -Q > /tmp/$$.haxor.xml
     CIB_user=root CIB_file=/tmp/$$.haxor.xml CIB_shadow="" cibadmin --delete --xml-text '<acls/>'
     CIB_user=root CIB_file=/tmp/$$.haxor.xml CIB_shadow="" cibadmin -Ql
 
     export CIB_user=niceguy
     desc="$CIB_user: Replace - remove acls"
     cmd="cibadmin --replace --xml-file /tmp/$$.haxor.xml"
     test_assert 13 0
 
     CIB_user=root cibadmin -Q > /tmp/$$.haxor.xml
     CIB_user=root CIB_file=/tmp/$$.haxor.xml CIB_shadow="" cibadmin -C -o resources --xml-text '<primitive id="dummy2" class="ocf" provider="pacemaker" type="Dummy"/>'
     CIB_user=root CIB_file=/tmp/$$.haxor.xml CIB_shadow="" cibadmin -Ql
 
     desc="$CIB_user: Replace - create resource"
     cmd="cibadmin --replace --xml-file /tmp/$$.haxor.xml"
     test_assert 13 0
 
     CIB_user=root cibadmin -Q > /tmp/$$.haxor.xml
     CIB_user=root CIB_file=/tmp/$$.haxor.xml CIB_shadow="" crm_attribute -n enable-acl -v false
     CIB_user=root CIB_file=/tmp/$$.haxor.xml CIB_shadow="" cibadmin -Ql
 
     desc="$CIB_user: Replace - modify attribute"
     cmd="cibadmin --replace --xml-file /tmp/$$.haxor.xml"
     test_assert 13 0
 
     CIB_user=root cibadmin -Q > /tmp/$$.haxor.xml
     CIB_user=root CIB_file=/tmp/$$.haxor.xml CIB_shadow="" cibadmin --replace --xml-text '<nvpair id="cib-bootstrap-options-enable-acl" name="enable-acl"/>'
     CIB_user=root CIB_file=/tmp/$$.haxor.xml CIB_shadow="" cibadmin -Ql
 
     desc="$CIB_user: Replace - delete attribute"
     cmd="cibadmin --replace --xml-file /tmp/$$.haxor.xml"
     test_assert 13 0
 
     CIB_user=root cibadmin -Q > /tmp/$$.haxor.xml
     CIB_user=root CIB_file=/tmp/$$.haxor.xml CIB_shadow="" cibadmin --modify --xml-text '<primitive id="dummy" description="nothing interesting"/>'
     CIB_user=root CIB_file=/tmp/$$.haxor.xml CIB_shadow="" cibadmin -Ql
 
     desc="$CIB_user: Replace - create attribute"
     cmd="cibadmin --replace --xml-file /tmp/$$.haxor.xml"
     test_assert 13 0
     rm -rf /tmp/$$.haxor.xml
 }
 
 function test_acls() {
     export CIB_shadow_dir=$test_home
     $VALGRIND_CMD crm_shadow --batch --force --create-empty $shadow --validate-with pacemaker-1.3 2>&1
     export CIB_shadow=$shadow
 
     cat<<EOF>/tmp/$$.acls.xml
     <acls>
       <acl_user id="l33t-haxor">
         <deny id="crook-nothing" xpath="/cib"/>
       </acl_user>
       <acl_user id="niceguy">
         <role_ref id="observer"/>
       </acl_user>
       <acl_role id="observer">
         <read id="observer-read-1" xpath="/cib"/>
         <write id="observer-write-1" xpath="//nvpair[@name=&apos;stonith-enabled&apos;]"/>
         <write id="observer-write-2" xpath="//nvpair[@name=&apos;target-role&apos;]"/>
       </acl_role>
     </acls>
 EOF
 
     desc="Configure some ACLs"
     cmd="cibadmin -M -o acls --xml-file /tmp/$$.acls.xml"
     test_assert 0
 
     desc="Enable ACLs"
     cmd="crm_attribute -n enable-acl -v true"
     test_assert 0
 
     desc="Set cluster option"
     cmd="crm_attribute -n no-quorum-policy -v ignore"
     test_assert 0
 
     desc="New ACL"
     cmd="cibadmin --create -o acls --xml-text '<acl_user id=\"badidea\"><read id=\"badidea-resources\" xpath=\"//meta_attributes\"/></acl_user>'"
     test_assert 0
 
     desc="Another ACL"
     cmd="cibadmin --create -o acls --xml-text '<acl_user id=\"betteridea\"><read id=\"betteridea-resources\" xpath=\"//meta_attributes\"/></acl_user>'"
     test_assert 0
 
     desc="Updated ACL"
     cmd="cibadmin --replace -o acls --xml-text '<acl_user id=\"betteridea\"><deny id=\"betteridea-nothing\" xpath=\"/cib\"/><read id=\"betteridea-resources\" xpath=\"//meta_attributes\"/></acl_user>'"
     test_assert 0
 
     test_acl_loop
 
     printf "\n\n    !#!#!#!#! Upgrading to pacemaker-2.0 and retesting !#!#!#!#!\n"
     printf "\nUpgrading to pacemaker-2.0 and re-testing\n" 1>&2
 
     export CIB_user=root
     desc="$CIB_user: Upgrade to pacemaker-2.0"
     cmd="cibadmin --upgrade --force -V"
     test_assert 0
 
     sed -i 's/epoch=.2/epoch=\"6/g' $CIB_shadow_dir/shadow.$CIB_shadow
     sed -i 's/admin_epoch=.1/admin_epoch=\"0/g' $CIB_shadow_dir/shadow.$CIB_shadow
 
     test_acl_loop
 }
 
 for t in $tests; do
     echo "Testing $t"
     test_$t > $test_home/regression.$t.out
 
     sed -i -e 's/cib-last-written.*>/>/'\
 	-e 's/ last-run=\"[0-9]*\"//'	\
 	-e 's/crm_feature_set="[^"]*" //'\
 	-e 's/validate-with="[^"]*" //'\
         -e 's/.*__xml_acl_check/__xml_acl_check/g'\
 	-e 's/.*__xml_acl_post_process/__xml_acl_post_process/g'\
 	-e 's/ last-rc-change=\"[0-9]*\"//' $test_home/regression.$t.out
 
     if [ $do_save = 1 ]; then
 	cp $test_home/regression.$t.out $test_home/regression.$t.exp
     fi
 done
     
 failed=0
 
 echo -e "\n\nResults"
 for t in $tests; do
     if [ $do_save = 1 ]; then
 	cp $test_home/regression.$t.out $test_home/regression.$t.exp
     fi
     if [ $verbose = 1 ]; then
 	diff -wu $test_home/regression.$t.exp $test_home/regression.$t.out
     else
 	diff -wu $test_home/regression.$t.exp $test_home/regression.$t.out
     fi
     if [ $? != 0 ]; then
 	failed=1
     fi
 done
 
 
 echo -e "\n\nSummary"
 for t in $tests; do
     grep -e "^*" $test_home/regression.$t.out
 done
 
 if [ $num_errors != 0 ]; then
     echo $num_errors tests failed
     exit 1
 elif [ $failed = 1 ]; then
     echo $num_passed tests passed but diff failed
     exit 2
 else
     echo $num_passed tests passed
     exit 0
 fi