
This was suggested in a review comment in I8a5d62a076a5a50597f2f1df3a8615afba6dadb2. It works out quite nicely because the BlockDevice() driver now doesn't need to know anything about stevedore or plugins, and just works on the node list. It also simplifies the unit testing by not having to call create_graph through a BlockDevice object. Change-Id: I98512f6cf42e256d2ea8225a0b496d303bf357b8
53 lines
1.9 KiB
Python
53 lines
1.9 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import logging
|
|
import mock
|
|
|
|
import diskimage_builder.block_device.tests.test_config as tc
|
|
|
|
from diskimage_builder.block_device.config import create_graph
|
|
from diskimage_builder.block_device.level3.mount import MountPointNode
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class TestMountOrder(tc.TestGraphGeneration):
|
|
|
|
@mock.patch('diskimage_builder.block_device.level3.mount.exec_sudo')
|
|
def test_mount_order(self, mock_exec_sudo):
|
|
|
|
config = self.load_config_file('multiple_partitions_graph.yaml')
|
|
|
|
graph, call_order = create_graph(config, self.fake_default_config)
|
|
|
|
result = {}
|
|
result['filesys'] = {}
|
|
result['filesys']['mkfs_root'] = {}
|
|
result['filesys']['mkfs_root']['device'] = 'fake'
|
|
result['filesys']['mkfs_var'] = {}
|
|
result['filesys']['mkfs_var']['device'] = 'fake'
|
|
result['filesys']['mkfs_var_log'] = {}
|
|
result['filesys']['mkfs_var_log']['device'] = 'fake'
|
|
|
|
rollback = []
|
|
|
|
for node in call_order:
|
|
if isinstance(node, MountPointNode):
|
|
# XXX: do we even need to create? We could test the
|
|
# sudo arguments from the mock in the below asserts
|
|
# too
|
|
node.create(result, rollback)
|
|
|
|
# ensure that partitions are mounted in order root->var->var/log
|
|
self.assertListEqual(result['mount_order'], ['/', '/var', '/var/log'])
|