Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2014-10-29 21:10:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2014-10-18 09:10:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-10-29 21:11:28.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Oct 28 22:54:01 UTC 2014 - [email protected] + +- Pre-release 2.2.0-rc1 +- Updated changelog + +------------------------------------------------------------------- +Tue Oct 28 20:56:39 UTC 2014 - [email protected] + +- medium: ui_resource: Only act on resources (#64) +- medium: ui_resource: Flatten, then filter (#64) +- high: ui_resource: Use correct name for error function (bnc#901453) +- high: ui_resource: resource trace failed if operation existed (bnc#901453) +- upstream cs: 2.1.0-114-gd51bf56 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.ypr63I/_old 2014-10-29 21:11:29.000000000 +0100 +++ /var/tmp/diff_new_pack.ypr63I/_new 2014-10-29 21:11:29.000000000 +0100 @@ -41,7 +41,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.1+git108 +Version: 2.2.0~rc1 Release: %{?crmsh_release}%{?dist} Url: http://crmsh.github.io Source0: crmsh.tar.bz2 ++++++ crmsh.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/ChangeLog new/crmsh/ChangeLog --- old/crmsh/ChangeLog 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/ChangeLog 2014-10-28 23:50:46.000000000 +0100 @@ -1,3 +1,54 @@ +* Tue Oct 28 2014 Kristoffer Grönlund <[email protected]> and many others +- Pre-release 2.2.0-rc1 +- cibconfig: Clean up output from crm_verify (bnc#893138) +- high: constants: Add acl_target and acl_group to cib_cli_map (bnc#894041) +- medium: cibconfig: Add set command +- doc: Rename asciidoc files to %.adoc +- high: parse: split shortcuts into valid rules +- medium: Handle broken CIB in find_objects +- high: scripts: Handle corosync.conf without nodelist in add-node (bnc#862577) +- low: template: Add 'new <template>' shortcut +- low: ui_configure: add rm as alias for delete +- low: ui_template: List both templates and configs by default +- medium: config: Assign default path in all cases +- low: main: Catch any ValueErrors that may leak through +- doc: Update TODO +- low: corosync: Check tools before use +- low: ui_ra: Don't crash when no OCF agents installed +- low: ra: Add systemd-support to RaOS +- doc: Updated documentation +- doc: Handle command names with underscore +- doc: Add tool to sort command list in documentation +- doc: Sort command list in documentation alphabetically +- high: cibconfig: Generate valid CLI syntax for attribute lists (bnc#897462) +- high: cibconfig: Add tag:<tag> to get all resources in tag +- low: report: Sort list of nodes +- low: ui_cluster: More informative error message +- low: main: Replace getopt with optparse +- high: parse: Allow empty attribute values in nvpairs (bnc#898625) +- high: ui_maintenance: Add maintenance sublevel (bnc#899234) +- medium: rsctest: Add basic support for systemd services +- medium: ui_maintenance: Combine action and actionssh into a single command +- low: rsctest: Better error message for unsupported action +- low: cibconfig: Improve wording of commit prompt +- high: cibconfig: Delay reinitialization after commit +- doc: Add website template for the nongnu page +- medium: main: Disable interspersed args +- low: cibconfig: Fix vim modeline +- high: report: Find nodes for any log type (boo#900654) +- high: hb_report: Collect logs from journald (boo#900654) +- doc: Clarified note for default-timeouts +- doc: Remove reference to crmsh documentation at clusterlabs.org +- doc: start-guide: Fix version check +- medium: xmlutil: Use idmgmt when creating new elements (bnc#901543) +- doc: cibconfig: Add note on inner ids after rename +- high: cibconfig: Don't crash if given an invalid pattern (bnc#901714) +- high: xmlutil: Filter list of referenced resources (bnc#901714) +- medium: ui_resource: Only act on resources (#64) +- medium: ui_resource: Flatten, then filter (#64) +- high: ui_resource: Use correct name for error function (bnc#901453) +- high: ui_resource: resource trace failed if operation existed (bnc#901453) + * Mon Jun 30 2014 Kristoffer Grönlund <[email protected]> and many others - Release 2.1 - Add atom feed to development page diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/configure.ac new/crmsh/configure.ac --- old/crmsh/configure.ac 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/configure.ac 2014-10-28 23:50:46.000000000 +0100 @@ -21,7 +21,7 @@ dnl checks for library functions dnl checks for system services -AC_INIT(crmsh, 2.0, [email protected]) +AC_INIT(crmsh, 2.2.0-rc1, [email protected]) AC_ARG_WITH(version, [ --with-version=version Override package version (if you're a packager needing to pretend) ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/ui_resource.py new/crmsh/modules/ui_resource.py --- old/crmsh/modules/ui_resource.py 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/modules/ui_resource.py 2014-10-28 23:50:46.000000000 +0100 @@ -134,12 +134,16 @@ return ret return obj + def is_resource(obj): + return xmlutil.is_resource(obj.node) + objs = cib_factory.find_objects(rsc) if objs is None: common_error("CIB is not valid!") return False while any(obj for obj in objs if obj.obj_type == 'tag'): objs = list(flatten(resolve(obj) for obj in objs)) + objs = filter(is_resource, objs) common_debug("set_deep_meta_attr: %s" % (', '.join([obj.obj_id for obj in objs]))) if not objs: common_error("Resource not found: %s" % (rsc)) @@ -476,9 +480,11 @@ op_nodes = rsc.node.xpath('.//op') def trace(name): - if not any(o for o in op_nodes if o.get('name') == name): - if not self._add_trace_op(rsc, name, '0'): - context.err("Failed to add trace for %s:%s" % (rsc_id, name)) + for o in op_nodes: + if o.get('name') == name: + return + if not self._add_trace_op(rsc, name, '0'): + context.fatal_error("Failed to add trace for %s:%s" % (rsc_id, name)) trace('start') trace('stop') if xmlutil.is_ms(rsc.node): @@ -491,19 +497,19 @@ op_nodes = rsc.node.xpath('.//op[@name="%s"]' % (op)) if not op_nodes: if op == 'monitor': - context.err("No monitor operation configured for %s" % (rsc_id)) + context.fatal_error("No monitor operation configured for %s" % (rsc_id)) if not self._add_trace_op(rsc, op, '0'): - context.err("Failed to add trace for %s:%s" % (rsc_id, op)) + context.fatal_error("Failed to add trace for %s:%s" % (rsc_id, op)) for op_node in op_nodes: rsc.set_op_attr(op_node, constants.trace_ra_attr, "1") def _trace_op_interval(self, context, rsc_id, rsc, op, interval): op_node = xmlutil.find_operation(rsc.node, op, interval) if op_node is None and utils.crm_msec(interval) != 0: - context.err("Operation %s with interval %s not found in %s" % (op, interval, rsc_id)) + context.fatal_error("Operation %s with interval %s not found in %s" % (op, interval, rsc_id)) if op_node is None: if not self._add_trace_op(rsc, op, interval): - context.err("Failed to add trace for %s:%s" % (rsc_id, op)) + context.fatal_error("Failed to add trace for %s:%s" % (rsc_id, op)) else: rsc.set_op_attr(op_node, constants.trace_ra_attr, "1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/regression.sh new/crmsh/test/regression.sh --- old/crmsh/test/regression.sh 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/regression.sh 2014-10-28 23:50:46.000000000 +0100 @@ -144,6 +144,8 @@ ./evaltest.sh $testargs ) < $TESTDIR/$testcase > $outf 2>&1 + perl -pi -e 's/\<cib[^>]*\>/\<cib\>/g' $outf + filter_output < $outf | if [ "$prepare" ]; then echo " saving to expect file" >&3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/confbasic-xml.exp new/crmsh/test/testcases/confbasic-xml.exp --- old/crmsh/test/testcases/confbasic-xml.exp 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/testcases/confbasic-xml.exp 2014-10-28 23:50:46.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config> <cluster_property_set id="cib-bootstrap-options"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/node.exp new/crmsh/test/testcases/node.exp --- old/crmsh/test/testcases/node.exp 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/testcases/node.exp 2014-10-28 23:50:46.000000000 +0100 @@ -9,7 +9,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -30,7 +30,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -51,7 +51,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -73,7 +73,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -95,7 +95,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -119,7 +119,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -144,7 +144,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/resource.exp new/crmsh/test/testcases/resource.exp --- old/crmsh/test/testcases/resource.exp 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/testcases/resource.exp 2014-10-28 23:50:46.000000000 +0100 @@ -7,7 +7,7 @@ .INP: _regtest on .INP: show xml p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -27,7 +27,7 @@ .INP: _regtest on .INP: show xml p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -48,7 +48,7 @@ .INP: _regtest on .INP: show xml c1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -69,7 +69,7 @@ .INP: _regtest on .INP: show xml c1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -92,7 +92,7 @@ .INP: _regtest on .INP: show xml cli-prefer-p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -113,7 +113,7 @@ .INP: _regtest on .INP: show xml cli-prefer-p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -134,7 +134,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -156,7 +156,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -178,7 +178,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -197,7 +197,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -220,7 +220,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -243,7 +243,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -262,7 +262,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -288,7 +288,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -314,7 +314,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -340,7 +340,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -370,7 +370,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -400,7 +400,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -432,7 +432,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -464,7 +464,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -492,7 +492,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -516,7 +516,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -540,7 +540,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -568,7 +568,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -592,7 +592,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -616,7 +616,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -648,7 +648,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -681,7 +681,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -709,7 +709,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/rset-xml.exp new/crmsh/test/testcases/rset-xml.exp --- old/crmsh/test/testcases/rset-xml.exp 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/testcases/rset-xml.exp 2014-10-28 23:50:46.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/unittests/test_bugs.py new/crmsh/test/unittests/test_bugs.py --- old/crmsh/test/unittests/test_bugs.py 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/unittests/test_bugs.py 2014-10-28 23:50:46.000000000 +0100 @@ -352,3 +352,21 @@ factory.create_from_node(etree.fromstring(tag)) elems = factory.get_elems_on_tag("tag:t0") assert set(x.obj_id for x in elems) == set(['r1', 'r2']) + +def test_ratrace(): + xml = '''<primitive class="ocf" id="%s" provider="pacemaker" type="Dummy"/>''' + factory.create_from_node(etree.fromstring(xml % ('r1'))) + factory.create_from_node(etree.fromstring(xml % ('r2'))) + factory.create_from_node(etree.fromstring(xml % ('r3'))) + + context = object() + + from ui_resource import RscMgmt + obj = factory.find_object('r1') + RscMgmt()._trace_resource(context, 'r1', obj) + + obj = factory.find_object('r1') + ops = obj.node.xpath('./operations/op') + for op in ops: + assert op.xpath('./instance_attributes/nvpair[@name="trace_ra"]/@value') == ["1"] + assert set(obj.node.xpath('./operations/op/@name')) == set(['start', 'stop']) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
