Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-07-26 17:38:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Mon Jul 26 17:38:08 2021 rev:218 rq:908174 version:4.3.1+20210726.3de6f304
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-07-16
00:02:36.928641849 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1899/crmsh.changes 2021-07-26
17:38:26.854068799 +0200
@@ -1,0 +2,14 @@
+Mon Jul 26 04:08:51 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20210726.3de6f304:
+ * Dev: testcases: adjust some testcases expected output due to previous
change
+ * Dev: ui_context: Add info when spell-corrections happen
+
+-------------------------------------------------------------------
+Mon Jul 19 09:41:22 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20210719.c45a9f5d:
+ * Dev: unittest: adjust unit test for previous changes
+ * Dev: ocfs2: set no-quorum-policy as freeze when configuring OCFS2
+
+-------------------------------------------------------------------
Old:
----
crmsh-4.3.1+20210714.57de51d5.tar.bz2
New:
----
crmsh-4.3.1+20210726.3de6f304.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.wdDy2r/_old 2021-07-26 17:38:27.470068059 +0200
+++ /var/tmp/diff_new_pack.wdDy2r/_new 2021-07-26 17:38:27.470068059 +0200
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0-or-later
Group: %{pkg_group}
-Version: 4.3.1+20210714.57de51d5
+Version: 4.3.1+20210726.3de6f304
Release: 0
URL: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.wdDy2r/_old 2021-07-26 17:38:27.510068011 +0200
+++ /var/tmp/diff_new_pack.wdDy2r/_new 2021-07-26 17:38:27.510068011 +0200
@@ -9,6 +9,6 @@
</service>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">04ebd4a8867006744623b189d7a6c4cc32cddfe0</param>
+ <param
name="changesrevision">27fd7dc2f00797a9593d6b672005c0590d13836e</param>
</service>
</servicedata>
\ No newline at end of file
++++++ crmsh-4.3.1+20210714.57de51d5.tar.bz2 ->
crmsh-4.3.1+20210726.3de6f304.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20210714.57de51d5/crmsh/ocfs2.py
new/crmsh-4.3.1+20210726.3de6f304/crmsh/ocfs2.py
--- old/crmsh-4.3.1+20210714.57de51d5/crmsh/ocfs2.py 2021-07-14
04:27:26.000000000 +0200
+++ new/crmsh-4.3.1+20210726.3de6f304/crmsh/ocfs2.py 2021-07-26
05:56:03.000000000 +0200
@@ -299,6 +299,11 @@
self._config_resource_stack_ocfs2_along()
bootstrap.status(" OCFS2 device {} mounted on
{}".format(self.target_device, self.mount_point))
+ res = utils.get_stdout_or_raise_error("crm configure get_property
no-quorum-policy")
+ if res != "freeze":
+ utils.get_stdout_or_raise_error("crm configure property
no-quorum-policy=freeze")
+ err_buf.info("'no-quorum-policy' is changed to \"freeze\"")
+
def _find_target_on_join(self, peer):
"""
Find device name from OCF Filesystem param on peer node
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20210714.57de51d5/crmsh/ui_context.py
new/crmsh-4.3.1+20210726.3de6f304/crmsh/ui_context.py
--- old/crmsh-4.3.1+20210714.57de51d5/crmsh/ui_context.py 2021-07-14
04:27:26.000000000 +0200
+++ new/crmsh-4.3.1+20210726.3de6f304/crmsh/ui_context.py 2021-07-26
05:56:03.000000000 +0200
@@ -79,6 +79,8 @@
if self.command_name in self.command_info.aliases and
self.command_name not in ["-h", "--help"]:
common_warn("This command '{}' is deprecated, please use
'{}'"\
.format(self.command_name, self.command_info.name))
+ if token != self.command_info.name:
+ common_info("\"{}\" is accepted as \"{}\"".format(token,
self.command_info.name))
self.command_name = self.command_info.name
if self.command_info.type == 'level':
self.enter_level(self.command_info.level)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.3.1+20210714.57de51d5/test/testcases/bugs.exp
new/crmsh-4.3.1+20210726.3de6f304/test/testcases/bugs.exp
--- old/crmsh-4.3.1+20210714.57de51d5/test/testcases/bugs.exp 2021-07-14
04:27:26.000000000 +0200
+++ new/crmsh-4.3.1+20210726.3de6f304/test/testcases/bugs.exp 2021-07-26
05:56:03.000000000 +0200
@@ -2,6 +2,7 @@
.INP: options
.INP: sort_elements false
WARNING: 2: This command 'sort_elements' is deprecated, please use
'sort-elements'
+INFO: 2: "sort_elements" is accepted as "sort-elements"
.INP: up
.INP: configure
.INP: erase
@@ -60,6 +61,7 @@
.INP: options
.INP: sort_elements false
WARNING: 2: This command 'sort_elements' is deprecated, please use
'sort-elements'
+INFO: 2: "sort_elements" is accepted as "sort-elements"
.INP: up
.INP: configure
.INP: load update bugs-test.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.3.1+20210714.57de51d5/test/testcases/confbasic.exp
new/crmsh-4.3.1+20210726.3de6f304/test/testcases/confbasic.exp
--- old/crmsh-4.3.1+20210714.57de51d5/test/testcases/confbasic.exp
2021-07-14 04:27:26.000000000 +0200
+++ new/crmsh-4.3.1+20210726.3de6f304/test/testcases/confbasic.exp
2021-07-26 05:56:03.000000000 +0200
@@ -25,6 +25,7 @@
.INP: delete m
.INP: master m d4
WARNING: 21: This command 'master' is deprecated, please use 'ms'
+INFO: 21: "master" is accepted as "ms"
.INP: primitive s5 ocf:pacemaker:Stateful operations $id-ref=d1-ops
.EXT crm_resource --show-metadata ocf:pacemaker:Stateful
.INP: primitive s6 ocf:pacemaker:Stateful operations $id-ref=d1
@@ -43,8 +44,10 @@
.INP: location l7 m5 rule $id-ref=l2
.INP: collocation c1 inf: m6 m5
WARNING: 36: This command 'collocation' is deprecated, please use 'colocation'
+INFO: 36: "collocation" is accepted as "colocation"
.INP: collocation c2 inf: m5:Master d1:Started
WARNING: 37: This command 'collocation' is deprecated, please use 'colocation'
+INFO: 37: "collocation" is accepted as "colocation"
.INP: order o1 Mandatory: m5 m6
.INP: order o2 Optional: d1:start m5:promote
.INP: order o3 Serialize: m5 m6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.3.1+20210714.57de51d5/test/testcases/history.exp
new/crmsh-4.3.1+20210726.3de6f304/test/testcases/history.exp
--- old/crmsh-4.3.1+20210714.57de51d5/test/testcases/history.exp
2021-07-14 04:27:26.000000000 +0200
+++ new/crmsh-4.3.1+20210726.3de6f304/test/testcases/history.exp
2021-07-26 05:56:03.000000000 +0200
@@ -319,6 +319,7 @@
.INP: # reduce report span
.INP: timeframe "2012-12-14 20:07:30"
WARNING: 21: This command 'timeframe' is deprecated, please use 'limit'
+INFO: 21: "timeframe" is accepted as "limit"
.INP: peinputs
history-test/xen-e/pengine/pe-input-47.bz2
history-test/xen-e/pengine/pe-input-48.bz2
@@ -375,6 +376,7 @@
.INP: # reset timeframe
.INP: timeframe
WARNING: 32: This command 'timeframe' is deprecated, please use 'limit'
+INFO: 32: "timeframe" is accepted as "limit"
.INP: session save _crmsh_regtest
.INP: session load _crmsh_regtest
.INP: session
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.3.1+20210714.57de51d5/test/testcases/resource.exp
new/crmsh-4.3.1+20210726.3de6f304/test/testcases/resource.exp
--- old/crmsh-4.3.1+20210714.57de51d5/test/testcases/resource.exp
2021-07-14 04:27:26.000000000 +0200
+++ new/crmsh-4.3.1+20210726.3de6f304/test/testcases/resource.exp
2021-07-26 05:56:03.000000000 +0200
@@ -143,6 +143,7 @@
.SETENV showobj=cli-prefer-p3
.TRY resource migrate p3 node1
WARNING: This command 'migrate' is deprecated, please use 'move'
+INFO: "migrate" is accepted as "move"
.EXT crm_resource --quiet --move --resource 'p3' --node 'node1'
INFO: Move constraint created for p3 to node1
.INP: configure
@@ -163,11 +164,13 @@
.SETENV showobj=
.TRY resource unmigrate p3
WARNING: This command 'unmigrate' is deprecated, please use 'clear'
+INFO: "unmigrate" is accepted as "clear"
.EXT crm_resource --quiet --clear --resource 'p3'
INFO: Removed migration constraints for p3
.SETENV showobj=cli-prefer-p3
.TRY resource migrate p3 node1 force
WARNING: This command 'migrate' is deprecated, please use 'move'
+INFO: "migrate" is accepted as "move"
.EXT crm_resource --quiet --move --resource 'p3' --node 'node1' --force
INFO: Move constraint created for p3 to node1
.INP: configure
@@ -188,6 +191,7 @@
.SETENV showobj=
.TRY resource unmigrate p3
WARNING: This command 'unmigrate' is deprecated, please use 'clear'
+INFO: "unmigrate" is accepted as "clear"
.EXT crm_resource --quiet --clear --resource 'p3'
INFO: Removed migration constraints for p3
.SETENV showobj=p0
@@ -916,6 +920,7 @@
.TRY resource stop p3
.TRY configure rm cg
WARNING: This command 'rm' is deprecated, please use 'delete'
+INFO: "rm" is accepted as "delete"
.TRY configure ms msg g
.TRY resource scores
.EXT crm_simulate -sUL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.3.1+20210714.57de51d5/test/unittests/test_ocfs2.py
new/crmsh-4.3.1+20210726.3de6f304/test/unittests/test_ocfs2.py
--- old/crmsh-4.3.1+20210714.57de51d5/test/unittests/test_ocfs2.py
2021-07-14 04:27:26.000000000 +0200
+++ new/crmsh-4.3.1+20210726.3de6f304/test/unittests/test_ocfs2.py
2021-07-26 05:56:03.000000000 +0200
@@ -372,12 +372,14 @@
mock_mkfs.assert_called_once_with("/dev/sdb2")
mock_fs.assert_called_once_with()
+ @mock.patch('crmsh.utils.get_stdout_or_raise_error')
@mock.patch('crmsh.ocfs2.OCFS2Manager._config_resource_stack_lvm2')
@mock.patch('crmsh.utils.all_exist_id')
@mock.patch('crmsh.ocfs2.OCFS2Manager._dynamic_verify')
@mock.patch('crmsh.bootstrap.status')
- def test_init_ocfs2_lvm2(self, mock_status, mock_dynamic_verify,
mock_all_id, mock_lvm2):
+ def test_init_ocfs2_lvm2(self, mock_status, mock_dynamic_verify,
mock_all_id, mock_lvm2, mock_run):
mock_all_id.return_value = []
+ mock_run.return_value = "freeze"
self.ocfs2_inst7.mount_point = "/data"
self.ocfs2_inst7.target_device = "/dev/vg1/lv1"
self.ocfs2_inst7.init_ocfs2()
@@ -389,12 +391,14 @@
mock_all_id.assert_called_once_with()
mock_lvm2.assert_called_once_with()
+ @mock.patch('crmsh.utils.get_stdout_or_raise_error')
@mock.patch('crmsh.ocfs2.OCFS2Manager._config_resource_stack_ocfs2_along')
@mock.patch('crmsh.utils.all_exist_id')
@mock.patch('crmsh.ocfs2.OCFS2Manager._dynamic_verify')
@mock.patch('crmsh.bootstrap.status')
- def test_init_ocfs2(self, mock_status, mock_dynamic_verify, mock_all_id,
mock_ocfs2):
+ def test_init_ocfs2(self, mock_status, mock_dynamic_verify, mock_all_id,
mock_ocfs2, mock_run):
mock_all_id.return_value = []
+ mock_run.side_effect = ["stop", None]
self.ocfs2_inst3.mount_point = "/data"
self.ocfs2_inst3.target_device = "/dev/sda1"
self.ocfs2_inst3.init_ocfs2()
@@ -405,6 +409,10 @@
mock_dynamic_verify.assert_called_once_with()
mock_all_id.assert_called_once_with()
mock_ocfs2.assert_called_once_with()
+ mock_run.assert_has_calls([
+ mock.call("crm configure get_property no-quorum-policy"),
+ mock.call("crm configure property no-quorum-policy=freeze")
+ ])
@mock.patch('crmsh.utils.get_stdout_or_raise_error')
def test_find_target_on_join_none(self, mock_run):
