1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
Description: Fix testsuite
Make sure testsuite output works with Pacemaker 2.
Author: Valentin Vidic <vvidic@debian.org>
Last-Update: 2021-02-03
--- a/test/unittests/test_utils.py
+++ b/test/unittests/test_utils.py
@@ -34,12 +34,12 @@
mock_run.assert_called_once_with("crm_node -l")
-@mock.patch("crmsh.sh.ShellUtils.get_stdout")
+@mock.patch("crmsh.sh.ShellUtils.get_stdout_stderr")
def test_package_is_installed_local(mock_run):
- mock_run.return_value = (0, None)
+ mock_run.return_value = (0, None, None)
res = utils.package_is_installed("crmsh")
assert res is True
- mock_run.assert_called_once_with("rpm -q --quiet crmsh")
+ mock_run.assert_called_once_with("dpkg-query --status crmsh")
@mock.patch('crmsh.utils.detect_file')
--- a/test/unittests/test_sbd.py
+++ b/test/unittests/test_sbd.py
@@ -512,9 +512,9 @@
self.sbd_inst._update_sbd_configuration()
- mock_copy.assert_called_once_with("/usr/share/fillup-templates/sysconfig.sbd", "/etc/sysconfig/sbd")
- mock_sysconfig.assert_called_once_with("/etc/sysconfig/sbd", SBD_WATCHDOG_DEV='/dev/watchdog', SBD_DEVICE='/dev/sdb1;/dev/sdc1', SBD_WATCHDOG_TIMEOUT="15")
- mock_update.assert_called_once_with("/etc/sysconfig/sbd")
+ mock_copy.assert_called_once_with("/usr/share/fillup-templates/sysconfig.sbd", "/etc/default/sbd")
+ mock_sysconfig.assert_called_once_with("/etc/default/sbd", SBD_WATCHDOG_DEV='/dev/watchdog', SBD_DEVICE='/dev/sdb1;/dev/sdc1', SBD_WATCHDOG_TIMEOUT="15")
+ mock_update.assert_called_once_with("/etc/default/sbd")
@mock.patch('crmsh.bootstrap.utils.parse_sysconfig')
def test_get_sbd_device_from_config_none(self, mock_parse):
@@ -525,7 +525,7 @@
res = self.sbd_inst._get_sbd_device_from_config()
assert res == []
- mock_parse.assert_called_once_with("/etc/sysconfig/sbd")
+ mock_parse.assert_called_once_with("/etc/default/sbd")
mock_parse_inst.get.assert_called_once_with("SBD_DEVICE")
@mock.patch('crmsh.utils.re_split_string')
@@ -539,7 +539,7 @@
res = self.sbd_inst._get_sbd_device_from_config()
assert res == ["/dev/sdb1", "/dev/sdc1"]
- mock_parse.assert_called_once_with("/etc/sysconfig/sbd")
+ mock_parse.assert_called_once_with("/etc/default/sbd")
mock_parse_inst.get.assert_called_once_with("SBD_DEVICE")
mock_split.assert_called_once_with(sbd.SBDManager.PARSE_RE, "/dev/sdb1;/dev/sdc1")
@@ -712,7 +712,7 @@
mock_exists.return_value = False
self.sbd_inst.join_sbd("alice", "node1")
mock_package.assert_called_once_with("sbd")
- mock_exists.assert_called_once_with("/etc/sysconfig/sbd")
+ mock_exists.assert_called_once_with("/etc/default/sbd")
mock_invoke.assert_called_once_with("systemctl disable sbd.service")
@mock.patch('crmsh.bootstrap.invoke')
@@ -727,7 +727,7 @@
self.sbd_inst.join_sbd("alice", "node1")
mock_package.assert_called_once_with("sbd")
- mock_exists.assert_called_once_with("/etc/sysconfig/sbd")
+ mock_exists.assert_called_once_with("/etc/default/sbd")
mock_invoke.assert_called_once_with("systemctl disable sbd.service")
mock_enabled.assert_called_once_with("sbd.service", "node1")
@@ -751,7 +751,7 @@
self.sbd_inst.join_sbd("alice", "node1")
mock_package.assert_called_once_with("sbd")
- mock_exists.assert_called_once_with("/etc/sysconfig/sbd")
+ mock_exists.assert_called_once_with("/etc/default/sbd")
mock_invoke.assert_called_once_with("systemctl enable sbd.service")
mock_get_device.assert_called_once_with()
mock_verify.assert_called_once_with(["/dev/sdb1"], ["node1"])
@@ -781,7 +781,7 @@
self.sbd_inst.join_sbd("alice", "node1")
mock_package.assert_called_once_with("sbd")
- mock_exists.assert_called_once_with("/etc/sysconfig/sbd")
+ mock_exists.assert_called_once_with("/etc/default/sbd")
mock_invoke.assert_called_once_with("systemctl enable sbd.service")
mock_get_device.assert_called_once_with()
mock_warn.assert_called_once_with("node1")
--- a/test/unittests/test_ui_cluster.py
+++ b/test/unittests/test_ui_cluster.py
@@ -44,11 +44,13 @@
mock_qdevice_configured.return_value = False
context_inst = mock.Mock()
mock_parse_nodes.return_value = ["node1", "node2"]
- mock_active.side_effect = [True, True]
+ mock_active.side_effect = [True, True, True, True]
self.ui_cluster_inst.do_start(context_inst, "node1", "node2")
mock_parse_nodes.assert_called_once_with(context_inst, "node1", "node2")
mock_active.assert_has_calls([
+ mock.call("corosync.service", remote_addr="node1"),
mock.call("pacemaker.service", remote_addr="node1"),
+ mock.call("corosync.service", remote_addr="node2"),
mock.call("pacemaker.service", remote_addr="node2")
])
mock_info.assert_has_calls([
@@ -67,12 +69,13 @@
context_inst = mock.Mock()
mock_start_pacemaker.return_value = ["node1"]
mock_parse_nodes.return_value = ["node1"]
- mock_active.side_effect = [False, False]
+ mock_active.side_effect = [False, False, False]
mock_qdevice_configured.return_value = True
self.ui_cluster_inst.do_start(context_inst, "node1")
mock_active.assert_has_calls([
+ mock.call("corosync.service", remote_addr="node1"),
mock.call("pacemaker.service", remote_addr="node1"),
mock.call("corosync-qdevice.service", remote_addr="node1")
])
--- a/test/unittests/test_bootstrap.py
+++ b/test/unittests/test_bootstrap.py
@@ -1760,7 +1760,7 @@
bootstrap.rm_configuration_files()
mock_run.assert_has_calls([
mock.call('rm -f file1 file2', None),
- mock.call('cp /usr/share/fillup-templates/sysconfig.sbd /etc/sysconfig/sbd', None)
+ mock.call('cp /usr/share/fillup-templates/sysconfig.sbd /etc/default/sbd', None)
])
@mock.patch('crmsh.utils.get_iplist_from_name')
--- a/test/cibtests/001.exp.xml
+++ b/test/cibtests/001.exp.xml
@@ -9,6 +9,9 @@
<resources>
<primitive id="rsc_dummy" class="ocf" provider="heartbeat" type="Dummy">
<operations>
+ <op name="monitor" timeout="20s" interval="10s" id="rsc_dummy-monitor-10s"/>
+ <op name="start" timeout="20s" interval="0s" id="rsc_dummy-start-0s"/>
+ <op name="stop" timeout="20s" interval="0s" id="rsc_dummy-stop-0s"/>
<op name="monitor" interval="30" id="rsc_dummy-monitor-30"/>
</operations>
</primitive>
--- a/test/cibtests/002.exp.xml
+++ b/test/cibtests/002.exp.xml
@@ -13,6 +13,11 @@
<nvpair name="interleave" value="true" id="testfs-clone-meta_attributes-interleave"/>
</meta_attributes>
<primitive id="testfs" class="ocf" provider="heartbeat" type="Dummy">
+ <operations>
+ <op name="monitor" timeout="20s" interval="10s" id="testfs-monitor-10s"/>
+ <op name="start" timeout="20s" interval="0s" id="testfs-start-0s"/>
+ <op name="stop" timeout="20s" interval="0s" id="testfs-stop-0s"/>
+ </operations>
<instance_attributes id="testfs-instance_attributes">
<nvpair name="fake" value="1" id="testfs-instance_attributes-fake"/>
</instance_attributes>
--- a/test/cibtests/003.exp.xml
+++ b/test/cibtests/003.exp.xml
@@ -14,6 +14,11 @@
<nvpair id="testfs-clone-meta_attributes-target-role" name="target-role" value="Stopped"/>
</meta_attributes>
<primitive id="testfs" class="ocf" provider="heartbeat" type="Dummy">
+ <operations>
+ <op name="monitor" timeout="20s" interval="10s" id="testfs-monitor-10s"/>
+ <op name="start" timeout="20s" interval="0s" id="testfs-start-0s"/>
+ <op name="stop" timeout="20s" interval="0s" id="testfs-stop-0s"/>
+ </operations>
<instance_attributes id="testfs-instance_attributes">
<nvpair name="fake" value="2" id="testfs-instance_attributes-fake"/>
</instance_attributes>
--- a/test/cibtests/004.exp.xml
+++ b/test/cibtests/004.exp.xml
@@ -14,6 +14,11 @@
<nvpair id="testfs-clone-meta_attributes-target-role" name="target-role" value="Started"/>
</meta_attributes>
<primitive id="testfs" class="ocf" provider="heartbeat" type="Dummy">
+ <operations>
+ <op name="monitor" timeout="20s" interval="10s" id="testfs-monitor-10s"/>
+ <op name="start" timeout="20s" interval="0s" id="testfs-start-0s"/>
+ <op name="stop" timeout="20s" interval="0s" id="testfs-stop-0s"/>
+ </operations>
<instance_attributes id="testfs-instance_attributes">
<nvpair name="fake" value="hello" id="testfs-instance_attributes-fake"/>
</instance_attributes>
|
