Merge pull request #1978 from ogayot/restricted-block-probing+nvme
filesystem: probe NVMe controllers when running the restricted probe
This commit is contained in:
commit
1d7c7c051c
|
@ -1270,7 +1270,7 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
|
||||||
@with_context(name="probe_once", description="restricted={restricted}")
|
@with_context(name="probe_once", description="restricted={restricted}")
|
||||||
async def _probe_once(self, *, context, restricted):
|
async def _probe_once(self, *, context, restricted):
|
||||||
if restricted:
|
if restricted:
|
||||||
probe_types = {"blockdev", "filesystem"}
|
probe_types = {"blockdev", "filesystem", "nvme"}
|
||||||
fname = "probe-data-restricted.json"
|
fname = "probe-data-restricted.json"
|
||||||
key = "ProbeDataRestricted"
|
key = "ProbeDataRestricted"
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -108,7 +108,7 @@ class TestSubiquityControllerFilesystem(IsolatedAsyncioTestCase):
|
||||||
|
|
||||||
async def test_probe_restricted(self):
|
async def test_probe_restricted(self):
|
||||||
await self.fsc._probe_once(context=None, restricted=True)
|
await self.fsc._probe_once(context=None, restricted=True)
|
||||||
expected = {"blockdev", "filesystem"}
|
expected = {"blockdev", "filesystem", "nvme"}
|
||||||
self.app.prober.get_storage.assert_called_with(expected)
|
self.app.prober.get_storage.assert_called_with(expected)
|
||||||
|
|
||||||
async def test_probe_os_prober_false(self):
|
async def test_probe_os_prober_false(self):
|
||||||
|
|
Loading…
Reference in New Issue