Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: fix tests after dropping unnecessary admin.label.List call

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-12-05 22:52:34 +01:00
parent 5b7ea16808
commit 01114e828b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubesadmin/tests/app.py
View File

@ -220,10 +220,6 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
self.assertAllCalled() self.assertAllCalled()
def clone_setup_common_calls(self, src, dst): def clone_setup_common_calls(self, src, dst):
# labels
self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = \
b'0\x00red\ngreen\nblue\n'
# have each property type with default=no, each special-cased, # have each property type with default=no, each special-cased,
# and some with default=yes # and some with default=yes
properties = { properties = {
@ -437,8 +433,6 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
self.assertAllCalled() self.assertAllCalled()
def test_035_clone_fail(self): def test_035_clone_fail(self):
self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = \
b'0\x00red\ngreen\nblue\n'
self.app.expected_calls[ self.app.expected_calls[
('test-vm', 'admin.vm.property.List', None, None)] = \ ('test-vm', 'admin.vm.property.List', None, None)] = \
b'0\0qid\nname\ntemplate\nlabel\nmemory\n' b'0\0qid\nname\ntemplate\nlabel\nmemory\n'

3
qubesadmin/tests/tools/qvm_ls.py
View File

@ -94,9 +94,6 @@ class TC_90_List_with_qubesd_calls(qubesadmin.tests.QubesTestCase):
b'0\x00vm1 class=AppVM state=Running\n' \ b'0\x00vm1 class=AppVM state=Running\n' \
b'template1 class=TemplateVM state=Halted\n' \ b'template1 class=TemplateVM state=Halted\n' \
b'sys-net class=AppVM state=Running\n' b'sys-net class=AppVM state=Running\n'
self.app.expected_calls[
('dom0', 'admin.label.List', None, None)] = \
b'0\x00red\nblack\ngreen\nblue\n'
self.app.expected_calls[ self.app.expected_calls[
('vm1', 'admin.vm.List', None, None)] = \ ('vm1', 'admin.vm.List', None, None)] = \
b'0\x00vm1 class=AppVM state=Running\n' b'0\x00vm1 class=AppVM state=Running\n'

9
qubesadmin/tests/tools/qvm_start_gui.py
View File

@ -43,9 +43,6 @@ class TC_00_qvm_start_gui(qubesadmin.tests.QubesTestCase):
self.app.expected_calls[ self.app.expected_calls[
('test-vm', 'admin.vm.property.Get', 'label', None)] = \ ('test-vm', 'admin.vm.property.Get', 'label', None)] = \
b'0\x00default=False type=label red' b'0\x00default=False type=label red'
self.app.expected_calls[
('dom0', 'admin.label.List', None, None)] = \
b'0\x00red\n'
proc_mock.side_effect = [ proc_mock.side_effect = [
b'KWIN_RUNNING = 0x1\n', b'KWIN_RUNNING = 0x1\n',
@ -84,9 +81,6 @@ class TC_00_qvm_start_gui(qubesadmin.tests.QubesTestCase):
self.app.expected_calls[ self.app.expected_calls[
('test-vm', 'admin.vm.property.Get', 'debug', None)] = \ ('test-vm', 'admin.vm.property.Get', 'debug', None)] = \
b'0\x00default=False type=bool False' b'0\x00default=False type=bool False'
self.app.expected_calls[
('dom0', 'admin.label.List', None, None)] = \
b'0\x00red\n'
self.app.expected_calls[ self.app.expected_calls[
('dom0', 'admin.label.Get', 'red', None)] = \ ('dom0', 'admin.label.Get', 'red', None)] = \
b'0\x000xff0000' b'0\x000xff0000'
@ -117,9 +111,6 @@ class TC_00_qvm_start_gui(qubesadmin.tests.QubesTestCase):
self.app.expected_calls[ self.app.expected_calls[
('test-vm', 'admin.vm.property.Get', 'debug', None)] = \ ('test-vm', 'admin.vm.property.Get', 'debug', None)] = \
b'0\x00default=False type=bool True' b'0\x00default=False type=bool True'
self.app.expected_calls[
('dom0', 'admin.label.List', None, None)] = \
b'0\x00red\n'
self.app.expected_calls[ self.app.expected_calls[
('dom0', 'admin.label.Get', 'red', None)] = \ ('dom0', 'admin.label.Get', 'red', None)] = \
b'0\x000xff0000' b'0\x000xff0000'