add utests and remove unnecessary cache check

Author: anon

qubesadmin/app.py

@@ -114,10 +114,7 @@ def refresh_cache(self) -> None:
             props_dict = dict(vm_prop.split("=", 1)
                               for vm_prop in props.split(" "))
             klass = typing.cast(Klass, props_dict["class"])
-            power_state = (
-                typing.cast(PowerState, props_dict.get("state"))
-                if self.app.cache_enabled else None
-            )
+            power_state = typing.cast(PowerState, props_dict.get("state"))
             new_known_names.add(vm_name)
             existing_vm = self._vms.get(vm_name) or\
                           vms_by_current_name.get(vm_name)

qubesadmin/tests/app.py

@@ -186,6 +186,70 @@ def test_012_getitem_cached_object(self):
         self.assertIsNot(vm1, vm4)
         self.assertAllCalled()
 
+    def test_013_get_blind_not_in_membership(self):
+        """Blind objects must not appear in membership operations."""
+        self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
+            b'0\x00test-vm class=AppVM state=Running\n'
+        self.assertIn('test-vm', self.app.domains)
+        self.app.domains.get_blind('other-vm')
+        self.assertNotIn('other-vm', self.app.domains)
+        self.assertNotIn('other-vm', self.app.domains.keys())
+        self.assertEqual([vm.name for vm in self.app.domains], ['test-vm'])
+        self.assertAllCalled()
+
+    def test_014_refresh_cache_forces_reload(self):
+        """refresh_cache() must trigger a new admin.vm.List call even if
+        already initialised."""
+        self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
+            b'0\x00test-vm class=AppVM state=Running\n'
+        self.assertIn('test-vm', self.app.domains)
+        self.assertNotIn('test-vm2', self.app.domains)
+        self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
+            b'0\x00test-vm2 class=AppVM state=Running\n'
+        self.app.domains.refresh_cache()
+        self.assertNotIn('test-vm', self.app.domains)
+        self.assertIn('test-vm2', self.app.domains)
+        self.assertAllCalled()
+
+    def test_015_delitem_targeted_cleanup(self):
+        """del domains[name] must remove the VM immediately without a
+        further admin.vm.List call."""
+        self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
+            b'0\x00test-vm class=AppVM state=Running\n'
+        self.app.expected_calls[('test-vm', 'admin.vm.Remove', None, None)] = \
+            b'0\x00'
+        self.assertIn('test-vm', self.app.domains)
+        del self.app.domains['test-vm']
+        self.assertNotIn('test-vm', self.app.domains)
+        self.assertAllCalled()
+
+    def test_016_rename_preserves_identity(self):
+        """After a rename, refresh_cache() must return the same object
+        under the new name."""
+        self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
+            b'0\x00test-vm class=AppVM state=Running\n'
+        vm = self.app.domains['test-vm']
+        vm._method_dest = 'new-name'
+        self.app.domains.clear_cache()
+        self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
+            b'0\x00new-name class=AppVM state=Running\n'
+        vm2 = self.app.domains['new-name']
+        self.assertIs(vm, vm2)
+        self.assertAllCalled()
+
+    def test_017_clear_cache_invalidate_name(self):
+        """clear_cache(invalidate_name) must drop that VM's object from the
+        cache so a fresh one is created on next access."""
+        self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
+            b'0\x00test-vm class=AppVM state=Running\n'
+        vm1 = self.app.domains['test-vm']
+        self.app.domains.clear_cache()
+        vm2 = self.app.domains['test-vm']
+        self.assertIs(vm1, vm2)
+        self.app.domains.clear_cache(invalidate_name = 'test-vm')
+        vm3 = self.app.domains['test-vm']
+        self.assertIsNot(vm1, vm3)
+        self.assertAllCalled()
 
 
 class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):

qubesadmin/tests/tools/qvm_ls.py

@@ -380,17 +380,10 @@ def test_101_list_selected(self):
             b'0\x00vm1 class=AppVM state=Running\n' \
             b'template1 class=TemplateVM state=Halted\n' \
             b'sys-net class=AppVM state=Running\n'
-        self.app.expected_calls[
-            ('vm1', 'admin.vm.CurrentState', None, None)] = \
-            b'0\x00power_state=Running'
-        self.app.expected_calls[
-            ('sys-net', 'admin.vm.CurrentState', None, None)] = \
-            b'0\x00power_state=Running'
         props = {
             'label': 'type=label green',
             'template': 'type=vm template1',
             'netvm': 'type=vm sys-net',
-#           'virt_mode': b'type=str pv',
         }
         self.app.expected_calls[
             ('vm1', 'admin.vm.property.GetAll', None, None)] = \

qubesadmin/vm/__init__.py

@@ -208,7 +208,7 @@ def get_power_state(self):
 
         """
 
-        if self._power_state_cache is not None:
+        if self._power_state_cache is not None and self.app.cache_enabled:
             return self._power_state_cache
         try:
             power_state = self._get_current_state()["power_state"]