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

tests: improve qubes_basdir_patching

Browse Source 
File storage pool use qubes.config.qubes_base_dir, not
qubes.config.system_path, so patch that too.
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-23 23:27:07 +02:00
parent 3cacf290bb
commit 6c29c653a0
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/tests/api_admin.py
View File

@ -41,6 +41,13 @@ volume_properties = [
class AdminAPITestCase(qubes.tests.QubesTestCase): class AdminAPITestCase(qubes.tests.QubesTestCase):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.test_base_dir = '/tmp/qubes-test-dir'
self.base_dir_patch = unittest.mock.patch.dict(qubes.config.system_path,
{'qubes_base_dir': self.test_base_dir})
self.base_dir_patch2 = unittest.mock.patch(
'qubes.config.qubes_base_dir', self.test_base_dir)
self.base_dir_patch.start()
self.base_dir_patch2.start()
app = qubes.Qubes('/tmp/qubes-test.xml', load=False) app = qubes.Qubes('/tmp/qubes-test.xml', load=False)
app.vmm = unittest.mock.Mock(spec=qubes.app.VMMConnection) app.vmm = unittest.mock.Mock(spec=qubes.app.VMMConnection)
app.load_initial_values() app.load_initial_values()
@ -68,12 +75,8 @@ class AdminAPITestCase(qubes.tests.QubesTestCase):
self.app.domains[0].fire_event = self.emitter.fire_event self.app.domains[0].fire_event = self.emitter.fire_event
self.app.domains[0].fire_event_pre = self.emitter.fire_event_pre self.app.domains[0].fire_event_pre = self.emitter.fire_event_pre
self.test_base_dir = '/tmp/qubes-test-dir'
self.base_dir_patch = unittest.mock.patch.dict(qubes.config.system_path,
{'qubes_base_dir': self.test_base_dir})
self.base_dir_patch.start()
def tearDown(self): def tearDown(self):
self.base_dir_patch2.stop()
self.base_dir_patch.stop() self.base_dir_patch.stop()
if os.path.exists(self.test_base_dir): if os.path.exists(self.test_base_dir):
shutil.rmtree(self.test_base_dir) shutil.rmtree(self.test_base_dir)