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

qubesadmin/tests/app.py

@@ -220,10 +220,6 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
         self.assertAllCalled()
 
     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,
         # and some with default=yes
         properties = {
@@ -437,8 +433,6 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
         self.assertAllCalled()
 
     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[
             ('test-vm', 'admin.vm.property.List', None, None)] = \
             b'0\0qid\nname\ntemplate\nlabel\nmemory\n'

qubesadmin/tests/tools/qvm_ls.py

@@ -94,9 +94,6 @@ class TC_90_List_with_qubesd_calls(qubesadmin.tests.QubesTestCase):
             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[
-            ('dom0', 'admin.label.List', None, None)] = \
-            b'0\x00red\nblack\ngreen\nblue\n'
         self.app.expected_calls[
             ('vm1', 'admin.vm.List', None, None)] = \
             b'0\x00vm1 class=AppVM state=Running\n'

qubesadmin/tests/tools/qvm_start_gui.py

@@ -43,9 +43,6 @@ class TC_00_qvm_start_gui(qubesadmin.tests.QubesTestCase):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.property.Get', 'label', None)] = \
                 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 = [
             b'KWIN_RUNNING = 0x1\n',
@@ -84,9 +81,6 @@ class TC_00_qvm_start_gui(qubesadmin.tests.QubesTestCase):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.property.Get', 'debug', None)] = \
                 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[
             ('dom0', 'admin.label.Get', 'red', None)] = \
             b'0\x000xff0000'
@@ -117,9 +111,6 @@ class TC_00_qvm_start_gui(qubesadmin.tests.QubesTestCase):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.property.Get', 'debug', None)] = \
                 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[
             ('dom0', 'admin.label.Get', 'red', None)] = \
             b'0\x000xff0000'