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

tests: when creating AppVM based on whonix-ws, connect it to tor

Browse Source 
Use sys-whonix if exists. This makes network-related tests more
realistic.
This commit is contained in:
Marek Marczykowski-Górecki 2016-08-02 02:15:08 +02:00
parent 5c9157be05
commit 0968c25486
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/extra.py
View File

@ -34,6 +34,7 @@ class ExtraTestCase(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
def setUp(self): def setUp(self):
super(ExtraTestCase, self).setUp() super(ExtraTestCase, self).setUp()
self.qc.unlock_db() self.qc.unlock_db()
self.default_netvm = None
def create_vms(self, names): def create_vms(self, names):
""" """
@ -52,7 +53,9 @@ class ExtraTestCase(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
for vmname in names: for vmname in names:
vm = self.qc.add_new_vm("QubesAppVm", vm = self.qc.add_new_vm("QubesAppVm",
name=self.make_vm_name(vmname), name=self.make_vm_name(vmname),
template=template) template=template,
uses_default_netvm=False,
netvm=self.default_netvm)
vm.create_on_disk(verbose=False) vm.create_on_disk(verbose=False)
self.save_and_reload_db() self.save_and_reload_db()
self.qc.unlock_db() self.qc.unlock_db()
@ -67,9 +70,11 @@ class ExtraTestCase(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
""" """
Enable access to the network. Must be called before creating VMs. Enable access to the network. Must be called before creating VMs.
""" """
# nothing to do in core2 self.default_netvm = self.qc.get_default_netvm()
pass if self.template.startswith('whonix-ws'):
whonix_netvm = self.qc.get_vm_by_name('sys-whonix')
if whonix_netvm:
self.default_netvm = whonix_netvm
def load_tests(loader, tests, pattern): def load_tests(loader, tests, pattern):
for entry in pkg_resources.iter_entry_points('qubes.tests.extra'): for entry in pkg_resources.iter_entry_points('qubes.tests.extra'):