|
@@ -49,8 +49,12 @@ class AdminAPITestCase(qubes.tests.QubesTestCase):
|
|
|
{'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_patch3 = unittest.mock.patch.dict(
|
|
|
+ qubes.config.defaults['pool_configs']['varlibqubes'],
|
|
|
+ {'dir_path': self.test_base_dir})
|
|
|
self.base_dir_patch.start()
|
|
|
self.base_dir_patch2.start()
|
|
|
+ self.base_dir_patch3.start()
|
|
|
app = qubes.Qubes('/tmp/qubes-test.xml', load=False)
|
|
|
app.vmm = unittest.mock.Mock(spec=qubes.app.VMMConnection)
|
|
|
app.load_initial_values()
|
|
@@ -62,6 +66,7 @@ class AdminAPITestCase(qubes.tests.QubesTestCase):
|
|
|
with qubes.tests.substitute_entry_points('qubes.storage',
|
|
|
'qubes.tests.storage'):
|
|
|
app.add_pool('test', driver='test')
|
|
|
+ app.default_pool = 'varlibqubes'
|
|
|
app.save = unittest.mock.Mock()
|
|
|
self.vm = app.add_new_vm('AppVM', label='red', name='test-vm1',
|
|
|
template='test-template')
|
|
@@ -78,6 +83,7 @@ class AdminAPITestCase(qubes.tests.QubesTestCase):
|
|
|
self.app.domains[0].fire_event = self.emitter.fire_event
|
|
|
|
|
|
def tearDown(self):
|
|
|
+ self.base_dir_patch3.stop()
|
|
|
self.base_dir_patch2.stop()
|
|
|
self.base_dir_patch.stop()
|
|
|
if os.path.exists(self.test_base_dir):
|
|
@@ -1155,7 +1161,8 @@ class TC_00_VMs(AdminAPITestCase):
|
|
|
self.assertEqual(vm.template, self.app.domains['test-template'])
|
|
|
# setting pool= affect only volumes actually created for this VM,
|
|
|
# not used from a template or so
|
|
|
- self.assertEqual(vm.volume_config['root']['pool'], 'default')
|
|
|
+ self.assertEqual(vm.volume_config['root']['pool'],
|
|
|
+ self.template.volumes['root'].pool)
|
|
|
self.assertEqual(vm.volume_config['private']['pool'], 'test')
|
|
|
self.assertEqual(vm.volume_config['volatile']['pool'], 'test')
|
|
|
self.assertEqual(vm.volume_config['kernel']['pool'], 'linux-kernel')
|
|
@@ -1177,9 +1184,11 @@ class TC_00_VMs(AdminAPITestCase):
|
|
|
vm = self.app.domains['test-vm2']
|
|
|
self.assertEqual(vm.label, self.app.get_label('red'))
|
|
|
self.assertEqual(vm.template, self.app.domains['test-template'])
|
|
|
- self.assertEqual(vm.volume_config['root']['pool'], 'default')
|
|
|
+ self.assertEqual(vm.volume_config['root']['pool'],
|
|
|
+ self.template.volumes['root'].pool)
|
|
|
self.assertEqual(vm.volume_config['private']['pool'], 'test')
|
|
|
- self.assertEqual(vm.volume_config['volatile']['pool'], 'default')
|
|
|
+ self.assertEqual(vm.volume_config['volatile']['pool'],
|
|
|
+ self.app.default_pool_volatile)
|
|
|
self.assertEqual(vm.volume_config['kernel']['pool'], 'linux-kernel')
|
|
|
self.assertEqual(storage_mock.mock_calls,
|
|
|
[unittest.mock.call(self.app.domains['test-vm2']).create()])
|