Merge pull request #1636 from dbungert/udi-gh-1772

storage: restricted probes must gather fs info
canonical · Apr 5, 2023 · 70a2a66 · 70a2a66
2 parents a8e2b3e + c921192
commit 70a2a66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/subiquity/server/controllers/filesystem.py b/subiquity/server/controllers/filesystem.py
@@ -846,7 +846,7 @@ async def v2_edit_partition_POST(self, data: ModifyPartitionV2) \
     @with_context(name='probe_once', description='restricted={restricted}')
     async def _probe_once(self, *, context, restricted):
         if restricted:
-            probe_types = {'blockdev'}
+            probe_types = {'blockdev', 'filesystem'}
             fname = 'probe-data-restricted.json'
             key = "ProbeDataRestricted"
         else:

diff --git a/subiquity/server/controllers/tests/test_filesystem.py b/subiquity/server/controllers/tests/test_filesystem.py
@@ -72,7 +72,8 @@ def setUp(self):
 
     async def test_probe_restricted(self):
         await self.fsc._probe_once(context=None, restricted=True)
-        self.app.prober.get_storage.assert_called_with({'blockdev'})
+        expected = {'blockdev', 'filesystem'}
+        self.app.prober.get_storage.assert_called_with(expected)
 
     async def test_probe_os_prober_false(self):
         self.app.opts.use_os_prober = False