Fix tests

Author: ben-grande

qubes_config/global_config/basics_handler.py

@@ -299,7 +299,7 @@ def get_current_value(self):
             return 0
         if not self.is_dvm_template:
             return 0
-        return int(self.qapp.domains["dom0"].features.get("preload-dispvm-max")) or 0
+        return int(self.qapp.domains["dom0"].features.get("preload-dispvm-max") or 0)
 
     def update_current_value(self):
         """This should never be called."""

qubes_config/tests/test_basics_handler.py

@@ -339,6 +339,9 @@ def test_kernels(test_qapp):
 
 
 def test_basics_handler(real_builder, test_qapp):
+    test_qapp.expected_calls[
+        ("dom0", "admin.vm.feature.Get", "preload-dispvm-max", None)
+    ] = b"0\x00"
     basics_handler = BasicSettingsHandler(real_builder, test_qapp)
 
     assert basics_handler.get_unsaved() == ""
@@ -364,7 +367,4 @@ def test_basics_handler(real_builder, test_qapp):
     test_qapp.expected_calls[
         ("dom0", "admin.property.Set", "clockvm", b"test-blue")
     ] = b"0\x00"
-    test_qapp.expected_calls[
-        ("dom0", "admin.vm.feature.Get", "preload-dispvm-max", None)
-    ] = b"0\x00"
     basics_handler.save()

qubes_config/tests/test_global_config.py

@@ -75,6 +75,9 @@ def test_qubes_global_config():
 def test_global_config_init(
     mock_error, mock_subprocess, test_qapp, test_policy_manager, test_builder
 ):
+    test_qapp.expected_calls[
+        ("dom0", "admin.vm.feature.Get", "preload-dispvm-max", None)
+    ] = b"0\x00"
     mock_subprocess.return_value = b""
     app = GlobalConfig(test_qapp, test_policy_manager)
     # do not call do_activate - it will make Gtk confused and, in case
@@ -140,6 +143,9 @@ def test_global_config_init(
 def test_global_config_page_change(
     mock_error, mock_subprocess, test_qapp, test_policy_manager, test_builder
 ):
+    test_qapp.expected_calls[
+        ("dom0", "admin.vm.feature.Get", "preload-dispvm-max", None)
+    ] = b"0\x00"
     mock_subprocess.return_value = b""
     app = GlobalConfig(test_qapp, test_policy_manager)
     # do not call do_activate - it will make Gtk confused and, in case
@@ -238,6 +244,9 @@ def test_global_config_page_change(
 def test_global_config_failure(
     mock_error, mock_subprocess, test_qapp, test_policy_manager, test_builder
 ):
+    test_qapp.expected_calls[
+        ("dom0", "admin.vm.feature.Get", "preload-dispvm-max", None)
+    ] = b"0\x00"
     mock_subprocess.return_value = b""
     app = GlobalConfig(test_qapp, test_policy_manager)
     # do not call do_activate - it will make Gtk confused and, in case
@@ -302,6 +311,9 @@ def test_global_config_broken_system(
 def test_global_config_open_at(
     mock_error, mock_subprocess, test_qapp, test_policy_manager, real_builder
 ):
+    test_qapp.expected_calls[
+        ("dom0", "admin.vm.feature.Get", "preload-dispvm-max", None)
+    ] = b"0\x00"
     mock_subprocess.return_value = b""
     app = GlobalConfig(test_qapp, test_policy_manager)
     # do not call do_activate - it will make Gtk confused and, in case