Revision d721894a test/py/ganeti.utils.storage_unittest.py
b/test/py/ganeti.utils.storage_unittest.py | ||
---|---|---|
26 | 26 |
import unittest |
27 | 27 |
|
28 | 28 |
from ganeti import constants |
29 |
from ganeti import errors |
|
30 | 29 |
from ganeti import objects |
31 | 30 |
from ganeti import pathutils |
32 | 31 |
from ganeti.utils import storage |
... | ... | |
38 | 37 |
|
39 | 38 |
def setUp(self): |
40 | 39 |
self._default_vg_name = "some_vg_name" |
40 |
self._cluster = mock.Mock() |
|
41 |
self._cluster.file_storage_dir = "my/file/storage/dir" |
|
41 | 42 |
self._cfg = mock.Mock() |
42 | 43 |
self._cfg.GetVGName = mock.Mock(return_value=self._default_vg_name) |
44 |
self._cfg.GetClusterInfo = mock.Mock(return_value=self._cluster) |
|
43 | 45 |
|
44 | 46 |
def testGetDefaultStorageUnitForDiskTemplateLvm(self): |
45 | 47 |
for disk_template in [constants.DT_DRBD8, constants.DT_PLAIN]: |
... | ... | |
54 | 56 |
storage._GetDefaultStorageUnitForDiskTemplate(self._cfg, |
55 | 57 |
constants.DT_FILE) |
56 | 58 |
self.assertEqual(storage_type, constants.ST_FILE) |
57 |
self.assertEqual(storage_key, pathutils.DEFAULT_FILE_STORAGE_DIR)
|
|
59 |
self.assertEqual(storage_key, self._cluster.file_storage_dir)
|
|
58 | 60 |
|
59 | 61 |
def testGetDefaultStorageUnitForDiskTemplateSharedFile(self): |
60 | 62 |
(storage_type, storage_key) = \ |
Also available in: Unified diff