Skip to content

Commit 2d39c24

Browse files
committed
Mock check_journal_coalesce for VDI activation in test_blktap2
Signed-off-by: Damien Thenot <damien.thenot@vates.tech>
1 parent f658823 commit 2d39c24

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

tests/test_blktap2.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,9 @@ def test_activate(self, mock_checkjournalcoalesce, mock_tapdisk, mock_nbd_link,
259259
@mock.patch('blktap2.VDI.BackendLink', autospec=True)
260260
@mock.patch('blktap2.VDI.NBDLink', autospec=True)
261261
@mock.patch('blktap2.Tapdisk')
262+
@mock.patch('blktap2.VDI._check_journal_coalesce_chain', autospec=True)
262263
def test_activate_relink_retry(
263-
self, mock_tapdisk, mock_nbd_link, mock_backend,
264+
self, mock_checkjournalcoalesce, mock_tapdisk, mock_nbd_link, mock_backend,
264265
mock_attach, mock_this_host, mock_sleep):
265266
"""
266267
Test blktap2.VDI.activate, relinking, retry 1, success
@@ -285,8 +286,9 @@ def test_activate_relink_retry(
285286
@mock.patch('blktap2.VDI.BackendLink', autospec=True)
286287
@mock.patch('blktap2.VDI.NBDLink', autospec=True)
287288
@mock.patch('blktap2.Tapdisk')
289+
@mock.patch('blktap2.VDI._check_journal_coalesce_chain', autospec=True)
288290
def test_activate_pause_retry(
289-
self, mock_tapdisk, mock_nbd_link, mock_backend,
291+
self, mock_checkjournalcoalesce, mock_tapdisk, mock_nbd_link, mock_backend,
290292
mock_attach, mock_this_host, mock_sleep):
291293
"""
292294
Test blktap2.VDI.activate, paused, retry 1, success
@@ -310,8 +312,9 @@ def test_activate_pause_retry(
310312
@mock.patch('blktap2.VDI.BackendLink', autospec=True)
311313
@mock.patch('blktap2.VDI.NBDLink', autospec=True)
312314
@mock.patch('blktap2.Tapdisk')
315+
@mock.patch('blktap2.VDI._check_journal_coalesce_chain', autospec=True)
313316
def test_activate_paused_while_tagging(
314-
self, mock_tapdisk, mock_nbd_link, mock_backend,
317+
self, mock_checkjournalcoalesce, mock_tapdisk, mock_nbd_link, mock_backend,
315318
mock_attach, mock_this_host, mock_sleep):
316319
"""
317320
Test blktap2.VDI.activate, paused, while tagging, success
@@ -341,8 +344,9 @@ def test_activate_paused_while_tagging(
341344
@mock.patch('blktap2.VDI.BackendLink', autospec=True)
342345
@mock.patch('blktap2.VDI.NBDLink', autospec=True)
343346
@mock.patch('blktap2.Tapdisk')
347+
@mock.patch('blktap2.VDI._check_journal_coalesce_chain', autospec=True)
344348
def test_activate_relink_while_tagging(
345-
self, mock_tapdisk, mock_nbd_link, mock_backend,
349+
self, mock_checkjournalcoalesce, mock_tapdisk, mock_nbd_link, mock_backend,
346350
mock_attach, mock_this_host, mock_sleep):
347351
"""
348352
Test blktap2.VDI.activate, relinking, while tagging, retry 1, success
@@ -372,8 +376,9 @@ def test_activate_relink_while_tagging(
372376
@mock.patch('blktap2.VDI.BackendLink', autospec=True)
373377
@mock.patch('blktap2.VDI.NBDLink', autospec=True)
374378
@mock.patch('blktap2.Tapdisk')
379+
@mock.patch('blktap2.VDI._check_journal_coalesce_chain', autospec=True)
375380
def test_activate_ro_already_activating_retry(
376-
self, mock_tapdisk, mock_nbd_link, mock_backend,
381+
self, mock_checkjournalcoalesce, mock_tapdisk, mock_nbd_link, mock_backend,
377382
mock_attach, mock_this_host, mock_sleep):
378383
"""
379384
If we're activating for read-only access, with someone else (let's
@@ -408,8 +413,9 @@ def test_activate_ro_already_activating_retry(
408413
@mock.patch('blktap2.VDI.BackendLink', autospec=True)
409414
@mock.patch('blktap2.VDI.NBDLink', autospec=True)
410415
@mock.patch('blktap2.Tapdisk')
416+
@mock.patch('blktap2.VDI._check_journal_coalesce_chain', autospec=True)
411417
def test_activate_rw_already_activating_fail(
412-
self, mock_tapdisk, mock_nbd_link, mock_backend,
418+
self, mock_checkjournalcoalesce, mock_tapdisk, mock_nbd_link, mock_backend,
413419
mock_attach, mock_this_host, mock_sleep):
414420
"""
415421
If we're activating for read-write access, with someone else (let's

0 commit comments

Comments
 (0)