Merge remote-tracking branch 'origin/pr/359' into pr-359-merge

* origin/pr/359:
  Late GUID for preloaded disposables
  Black formatter
  Handle preloaded disposables
  Black

Author: marmarek

doc/manpages/qvm-features.rst

@@ -455,12 +455,6 @@ disposable in the list. As soon as the preloaded disposable is requested to be
 used, it is removed from the `preload-dispvm` list, GUI applications entries
 become visible, followed by a new disposable being preloaded.
 
-.. warning::
-
-   Applications configured to autostart by the disposable template or the
-   template itself will be interactive before the preloaded disposable can be
-   paused.
-
 |
 | **Managed by**: system
 | **Valid on**: disposable template

qubesadmin/tests/tools/qvm_start_daemon.py

@@ -231,6 +231,9 @@ def test_020_start_gui_for_vm(self, proc_mock):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.property.Get', 'virt_mode', None)] = \
             b'0\x00default=False type=str pv'
+        self.app.expected_calls[
+            ('test-vm', 'admin.vm.property.Get', 'is_preload', None)] = \
+            b"2QubesNoSuchPropertyErrorInvalid property 'is_preload' of test-vm"
         self.app.expected_calls[
             ('test-vm', 'admin.vm.feature.CheckWithTemplate',
              'no-monitor-layout', None)] = \
@@ -272,6 +275,9 @@ def test_021_start_gui_for_vm_hvm(self, proc_mock):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.property.Get', 'debug', None)] = \
             b'0\x00default=False type=bool False'
+        self.app.expected_calls[
+            ('test-vm', 'admin.vm.property.Get', 'is_preload', None)] = \
+            b"2QubesNoSuchPropertyErrorInvalid property 'is_preload' of test-vm"
         self.app.expected_calls[
             ('test-vm', 'admin.vm.feature.CheckWithTemplate',
              'no-monitor-layout', None)] = \
@@ -312,6 +318,9 @@ def test_022_start_gui_for_vm_hvm_stubdom(self):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.property.Get', 'debug', None)] = \
             b'0\x00default=False type=bool False'
+        self.app.expected_calls[
+            ('test-vm', 'admin.vm.property.Get', 'is_preload', None)] = \
+            b"2QubesNoSuchPropertyErrorInvalid property 'is_preload' of test-vm"
         self.app.expected_calls[
             ('test-vm', 'admin.vm.feature.CheckWithTemplate',
              'no-monitor-layout', None)] = \
@@ -360,6 +369,9 @@ def test_030_start_gui_for_stubdomain(self):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.property.Get', 'stubdom_xid', None)] = \
             b'0\x00default=False type=int 3001'
+        self.app.expected_calls[
+            ('test-vm', 'admin.vm.property.Get', 'is_preload', None)] = \
+            b"2QubesNoSuchPropertyErrorInvalid property 'is_preload' of test-vm"
         self.app.expected_calls[
             ('test-vm', 'admin.vm.feature.CheckWithTemplate', 'gui', None)] = \
             b'2\x00QubesFeatureNotFoundError\x00\x00Feature not set\x00'
@@ -391,6 +403,9 @@ def test_031_start_gui_for_stubdomain_forced(self):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.property.Get', 'stubdom_xid', None)] = \
             b'0\x00default=False type=int 3001'
+        self.app.expected_calls[
+            ('test-vm', 'admin.vm.property.Get', 'is_preload', None)] = \
+            b"2QubesNoSuchPropertyErrorInvalid property 'is_preload' of test-vm"
         # self.app.expected_calls[
         #    ('test-vm', 'admin.vm.feature.CheckWithTemplate', 'gui', None)] = \
         #    b'0\x00'
@@ -442,6 +457,9 @@ def test_040_start_gui(self):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.property.Get', 'guivm', None)] = \
             b'0\x00default=False type=vm gui-vm'
+        self.app.expected_calls[
+            ('test-vm', 'admin.vm.property.Get', 'is_preload', None)] = \
+            b"2QubesNoSuchPropertyErrorInvalid property 'is_preload' of test-vm"
 
         # pylint: disable=protected-access
         self.app._local_name = 'gui-vm'