Fix test failures

Author: mckees

providers/base/tests/test_crucible_host.py

@@ -21,13 +21,18 @@
 from unittest.mock import MagicMock, patch
 
 import crucible_host
+from checkbox_support.helpers.host_utils import VulkanDetectionError
 
 
 class TestCmdResource(unittest.TestCase):
-    @patch("crucible_host.find_plz_run", return_value=None)
+    @patch(
+        "crucible_host.find_plz_run",
+        side_effect=VulkanDetectionError("plz-run not found"),
+    )
     @patch("crucible_host.get_arch_triple", return_value="x86_64-linux-gnu")
     def test_returns_1_when_plz_run_not_found(self, _arch, _plz):
-        self.assertEqual(crucible_host.cmd_resource(), 1)
+        with patch("sys.argv", ["crucible_host.py", "resource"]):
+            self.assertEqual(crucible_host.main(), 1)
 
 
 class TestCmdValidateInstall(unittest.TestCase):
@@ -50,7 +55,7 @@ def _mock_run(self, returncode=0):
         mock_result.returncode = returncode
         return MagicMock(return_value=mock_result)
 
-    @patch("crucible_host._active_vendor_prefixes", return_value=None)
+    @patch("crucible_host.active_vendor_prefixes", return_value=None)
     @patch("crucible_host.find_host_icd_filenames", return_value=ICD)
     def test_forwards_nonzero_returncode(self, _icd, _prefixes):
         mock_run = self._mock_run(returncode=1)
@@ -59,7 +64,7 @@ def test_forwards_nonzero_returncode(self, _icd, _prefixes):
                 crucible_host.cmd_run_test([self.FILTER_PATTERN]), 1
             )
 
-    @patch("crucible_host._active_vendor_prefixes", return_value=None)
+    @patch("crucible_host.active_vendor_prefixes", return_value=None)
     @patch("crucible_host.find_host_icd_filenames", return_value=ICD)
     def test_passes_correct_args(self, _icd, _prefixes):
         mock_run = self._mock_run()
@@ -79,15 +84,15 @@ def test_passes_correct_args(self, _icd, _prefixes):
         self.assertEqual(env["SNAP"], self.SNAP)
         self.assertEqual(env["NODEVICE_SELECT"], "1")
 
-    @patch("crucible_host._active_vendor_prefixes", return_value=None)
+    @patch("crucible_host.active_vendor_prefixes", return_value=None)
     @patch("crucible_host.find_host_icd_filenames", return_value="")
     def test_does_not_set_vk_icd_when_none_found(self, _icd, _prefixes):
         mock_run = self._mock_run()
         with patch("subprocess.run", mock_run):
             crucible_host.cmd_run_test([self.FILTER_PATTERN])
         self.assertNotIn("VK_ICD_FILENAMES", mock_run.call_args[1]["env"])
 
-    @patch("crucible_host._active_vendor_prefixes", return_value=None)
+    @patch("crucible_host.active_vendor_prefixes", return_value=None)
     @patch("crucible_host.find_host_icd_filenames", return_value=ICD)
     def test_respects_explicit_vk_icd_filenames(self, _icd, _prefixes):
         explicit = "/usr/share/vulkan/icd.d/nvidia_icd.json"

providers/base/tests/test_vk_host.py

@@ -21,6 +21,7 @@
 from unittest.mock import MagicMock, patch
 
 import vk_host
+from checkbox_support.helpers.host_utils import VulkanDetectionError
 
 
 class TestCmdResource(unittest.TestCase):
@@ -42,10 +43,14 @@ def test_returns_0_when_gpu_found(self, _arch, _plz, _check):
     def test_returns_1_when_no_gpu(self, _arch, _plz, _check):
         self.assertEqual(vk_host.cmd_resource(), 1)
 
-    @patch("vk_host.find_plz_run", return_value=None)
+    @patch(
+        "vk_host.find_plz_run",
+        side_effect=VulkanDetectionError("plz-run not found"),
+    )
     @patch("vk_host.get_arch_triple", return_value="x86_64-linux-gnu")
     def test_returns_1_when_plz_run_not_found(self, _arch, _plz):
-        self.assertEqual(vk_host.cmd_resource(), 1)
+        with patch("sys.argv", ["vk_host.py", "resource"]):
+            self.assertEqual(vk_host.main(), 1)
 
 
 class TestCmdValidateInstall(unittest.TestCase):
@@ -78,7 +83,7 @@ def _mock_run(self, returncode=0):
         mock_result.returncode = returncode
         return MagicMock(return_value=mock_result)
 
-    @patch("vk_host._active_vendor_prefixes", return_value=None)
+    @patch("vk_host.active_vendor_prefixes", return_value=None)
     @patch("vk_host.find_host_icd_filenames", return_value=ICD)
     def test_passes_correct_args(self, _icd, _prefixes):
         mock_run = self._mock_run()
@@ -93,22 +98,22 @@ def test_passes_correct_args(self, _icd, _prefixes):
         self.assertEqual(env["SNAP"], self.SNAP)
         self.assertEqual(env["NODEVICE_SELECT"], "1")
 
-    @patch("vk_host._active_vendor_prefixes", return_value=None)
+    @patch("vk_host.active_vendor_prefixes", return_value=None)
     @patch("vk_host.find_host_icd_filenames", return_value=ICD)
     def test_forwards_nonzero_returncode(self, _icd, _prefixes):
         mock_run = self._mock_run(returncode=1)
         with patch("subprocess.run", mock_run):
             self.assertEqual(vk_host.cmd_run_test([self.CASELIST]), 1)
 
-    @patch("vk_host._active_vendor_prefixes", return_value=None)
+    @patch("vk_host.active_vendor_prefixes", return_value=None)
     @patch("vk_host.find_host_icd_filenames", return_value="")
     def test_does_not_set_vk_icd_when_none_found(self, _icd, _prefixes):
         mock_run = self._mock_run()
         with patch("subprocess.run", mock_run):
             vk_host.cmd_run_test([self.CASELIST])
         self.assertNotIn("VK_ICD_FILENAMES", mock_run.call_args[1]["env"])
 
-    @patch("vk_host._active_vendor_prefixes", return_value=None)
+    @patch("vk_host.active_vendor_prefixes", return_value=None)
     @patch("vk_host.find_host_icd_filenames", return_value=ICD)
     def test_respects_explicit_vk_icd_filenames(self, _icd, _prefixes):
         explicit = "/usr/share/vulkan/icd.d/nvidia_icd.json"