|
@@ -1,4 +1,4 @@
|
|
-# -*- encoding: utf8 -*-
|
|
|
|
|
|
+# -*- encoding: utf-8 -*-
|
|
#
|
|
#
|
|
# The Qubes OS Project, http://www.qubes-os.org
|
|
# The Qubes OS Project, http://www.qubes-os.org
|
|
#
|
|
#
|
|
@@ -184,8 +184,8 @@ class TC_00_qvm_start_gui(qubesadmin.tests.QubesTestCase):
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm class=AppVM state=Running\n'
|
|
|
|
|
|
+ ('test-vm', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
('test-vm', 'admin.vm.property.Get', 'xid', None)] = \
|
|
('test-vm', 'admin.vm.property.Get', 'xid', None)] = \
|
|
b'0\x00default=False type=int 3000'
|
|
b'0\x00default=False type=int 3000'
|
|
@@ -215,8 +215,8 @@ class TC_00_qvm_start_gui(qubesadmin.tests.QubesTestCase):
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm class=AppVM state=Running\n'
|
|
|
|
|
|
+ ('test-vm', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
('test-vm', 'admin.vm.property.Get', 'xid', None)] = \
|
|
('test-vm', 'admin.vm.property.Get', 'xid', None)] = \
|
|
b'0\x00default=False type=int 3000'
|
|
b'0\x00default=False type=int 3000'
|
|
@@ -251,8 +251,8 @@ class TC_00_qvm_start_gui(qubesadmin.tests.QubesTestCase):
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm class=AppVM state=Running\n'
|
|
|
|
|
|
+ ('test-vm', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
('test-vm', 'admin.vm.property.Get', 'xid', None)] = \
|
|
('test-vm', 'admin.vm.property.Get', 'xid', None)] = \
|
|
b'0\x00default=False type=int 3000'
|
|
b'0\x00default=False type=int 3000'
|
|
@@ -377,8 +377,8 @@ class TC_00_qvm_start_gui(qubesadmin.tests.QubesTestCase):
|
|
b'0\x00test-vm class=AppVM state=Running\n' \
|
|
b'0\x00test-vm class=AppVM state=Running\n' \
|
|
b'gui-vm class=AppVM state=Running'
|
|
b'gui-vm class=AppVM state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm class=AppVM state=Running\n'
|
|
|
|
|
|
+ ('test-vm', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
('test-vm', 'admin.vm.feature.CheckWithTemplate', 'gui', None)] = \
|
|
('test-vm', 'admin.vm.feature.CheckWithTemplate', 'gui', None)] = \
|
|
b'0\x00True'
|
|
b'0\x00True'
|
|
@@ -506,8 +506,8 @@ HDMI1 connected 2560x1920+0+0 (normal left inverted right x axis y axis) 206mm x
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm class=AppVM state=Running\n'
|
|
|
|
|
|
+ ('test-vm', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
('test-vm', 'admin.vm.feature.CheckWithTemplate',
|
|
('test-vm', 'admin.vm.feature.CheckWithTemplate',
|
|
'no-monitor-layout', None)] = \
|
|
'no-monitor-layout', None)] = \
|
|
@@ -562,8 +562,8 @@ HDMI1 connected 2560x1920+0+0 (normal left inverted right x axis y axis) 206mm x
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00test-vm class=AppVM state=Halted\n'
|
|
b'0\x00test-vm class=AppVM state=Halted\n'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm class=AppVM state=Halted\n'
|
|
|
|
|
|
+ ('test-vm', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Halted'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
('test-vm', 'admin.vm.feature.CheckWithTemplate',
|
|
('test-vm', 'admin.vm.feature.CheckWithTemplate',
|
|
'no-monitor-layout', None)] = \
|
|
'no-monitor-layout', None)] = \
|
|
@@ -591,8 +591,8 @@ HDMI1 connected 2560x1920+0+0 (normal left inverted right x axis y axis) 206mm x
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm class=AppVM state=Running\n'
|
|
|
|
|
|
+ ('test-vm', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
('test-vm', 'admin.vm.property.Get', 'xid', None)] = \
|
|
('test-vm', 'admin.vm.property.Get', 'xid', None)] = \
|
|
b'0\x00default=False type=int 123'
|
|
b'0\x00default=False type=int 123'
|
|
@@ -642,17 +642,17 @@ HDMI1 connected 2560x1920+0+0 (normal left inverted right x axis y axis) 206mm x
|
|
b'test-vm4 class=AppVM state=Halted\n' \
|
|
b'test-vm4 class=AppVM state=Halted\n' \
|
|
b'gui-vm class=AppVM state=Running'
|
|
b'gui-vm class=AppVM state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm class=AppVM state=Running\n'
|
|
|
|
|
|
+ ('test-vm', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm2', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm2 class=AppVM state=Running\n'
|
|
|
|
|
|
+ ('test-vm2', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm3', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm3 class=AppVM state=Running\n'
|
|
|
|
|
|
+ ('test-vm3', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Running'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
- ('test-vm4', 'admin.vm.List', None, None)] = \
|
|
|
|
- b'0\x00test-vm4 class=AppVM state=Halted\n'
|
|
|
|
|
|
+ ('test-vm4', 'admin.vm.CurrentState', None, None)] = \
|
|
|
|
+ b'0\x00power_state=Halted'
|
|
self.app.expected_calls[
|
|
self.app.expected_calls[
|
|
('test-vm', 'admin.vm.feature.CheckWithTemplate',
|
|
('test-vm', 'admin.vm.feature.CheckWithTemplate',
|
|
'gui', None)] = \
|
|
'gui', None)] = \
|