From 3d8b053a8bf96ab6981878c0d15675f8a751aa76 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Wed, 27 Mar 2024 13:20:52 +0100 Subject: [PATCH] fixup! Add tests for zfs-ng --- tests/storage/zfs_ng/conftest.py | 2 +- tests/storage/zfs_ng/test_zfs_sr.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/storage/zfs_ng/conftest.py b/tests/storage/zfs_ng/conftest.py index 07a1c4ee9..3cc9180a4 100644 --- a/tests/storage/zfs_ng/conftest.py +++ b/tests/storage/zfs_ng/conftest.py @@ -14,7 +14,7 @@ def host_with_zfs(host_with_saved_yum_state): @pytest.fixture(scope='package') def zfs_sr(host, sr_disk_wiped, host_with_zfs): """ A ZFS SR on first host. """ - sr = host.sr_create('zfs-ng', "ZFS-local-SR-test", {'devices': '/dev/' + sr_disk_wiped}) + sr = host.sr_create('zfs-ng', "ZFS-local-SR-test", {'device': '/dev/' + sr_disk_wiped}) yield sr # teardown violently - we don't want to require manual recovery when a test fails sr.forget() diff --git a/tests/storage/zfs_ng/test_zfs_sr.py b/tests/storage/zfs_ng/test_zfs_sr.py index 42bd25f26..7ba427b1d 100755 --- a/tests/storage/zfs_ng/test_zfs_sr.py +++ b/tests/storage/zfs_ng/test_zfs_sr.py @@ -20,7 +20,7 @@ class TestZFSSRCreateDestroy: def test_create_and_destroy_sr(self, host, sr_disk_wiped): # Create and destroy tested in the same test to leave the host as unchanged as possible - sr = host.sr_create('zfs-ng', "ZFS-local-SR-test", {'devices': '/dev/' + sr_disk_wiped}, verify=True) + sr = host.sr_create('zfs-ng', "ZFS-local-SR-test", {'device': '/dev/' + sr_disk_wiped}, verify=True) # import a VM in order to detect vm import issues here rather than in the vm_on_xfs_fixture used in # the next tests, because errors in fixtures break teardown vm = host.import_vm(vm_image('mini-linux-x86_64-bios'), sr_uuid=sr.uuid)