From 3075767bb87b342e7e981e3f57f89e1f43710d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 27 Sep 2017 02:19:36 +0200 Subject: [PATCH] tests: add more complex test for netvm cyclic connection Something more complex than VM connecting to itself. --- qubes/tests/vm/mix/net.py | 9 +++++++++ qubes/tests/vm/qubesvm.py | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/qubes/tests/vm/mix/net.py b/qubes/tests/vm/mix/net.py index 356f65a7..5b9e45bc 100644 --- a/qubes/tests/vm/mix/net.py +++ b/qubes/tests/vm/mix/net.py @@ -96,6 +96,15 @@ class TC_00_NetVMMixin( self.addCleanup(self.app.domains.clear) self.assertPropertyInvalidValue(vm, 'netvm', vm) + def test_144_netvm_loopback2(self): + vm = self.get_vm() + self.setup_netvms(vm) + vm.netvm = None + self.netvm2.netvm = self.netvm1 + vm.provides_network = True + self.netvm1.netvm = vm + self.assertPropertyInvalidValue(vm, 'netvm', self.netvm2) + def test_150_ip(self): vm = self.get_vm() self.setup_netvms(vm) diff --git a/qubes/tests/vm/qubesvm.py b/qubes/tests/vm/qubesvm.py index b98363a4..ccd62b4b 100644 --- a/qubes/tests/vm/qubesvm.py +++ b/qubes/tests/vm/qubesvm.py @@ -121,9 +121,9 @@ class QubesVMTestsMixin(object): self.app = qubes.tests.vm.TestApp() self.app.vmm.offline_mode = True - def get_vm(self, **kwargs): + def get_vm(self, name='test', **kwargs): vm = qubes.vm.qubesvm.QubesVM(self.app, None, - qid=1, name=qubes.tests.VMPREFIX + 'test', + qid=1, name=qubes.tests.VMPREFIX + name, **kwargs) self.addCleanup(vm.close) return vm