diff --git a/qubes/tests/vm/__init__.py b/qubes/tests/vm/__init__.py index 1bba43df..62304fb2 100644 --- a/qubes/tests/vm/__init__.py +++ b/qubes/tests/vm/__init__.py @@ -38,9 +38,12 @@ class TestHost(object): class TestApp(qubes.tests.TestEmitter): labels = {1: qubes.Label(1, '0xcc0000', 'red')} - get_label = qubes.Qubes.get_label check_updates_vm = False + def get_label(self, label): + # pylint: disable=unused-argument + return self.labels[1] + def __init__(self): super(TestApp, self).__init__() self.vmm = TestVMM() diff --git a/qubes/tools/qvm_run.py b/qubes/tools/qvm_run.py index cfd8409b..dcbd8bdc 100644 --- a/qubes/tools/qvm_run.py +++ b/qubes/tools/qvm_run.py @@ -86,7 +86,7 @@ def main(args=None): if len(args.vm) > 1 and args.passio: parser.error('--passio cannot be used when more than 1 qube is chosen') - if args.localcmd and not passio.passio: + if args.localcmd and not args.passio: parser.error('--localcmd have no effect without --pass-io') if args.color_output and not args.filter_esc: parser.error('--color-output must be used with --filter-escape-chars')