35a1e7bee9
Currently we keep a global list of mount-points defined in the configuration and automatically setup dependencies between mount nodes based on their global "mount order" (i.e. higher directories mount first). The current method for achieving this is roughly to add the mount points to a dictionary indexed my mount-point, then at "get_edge()" call build the sorted list ... unless it has already been built because this gets called for every node. It seems much simpler to simply keep a sorted list of the MountPointNode objects as we add them. We don't need to implement a sorting algorithm then, we can just use sort() and implement __lt__ for the nodes. I believe the existing mount-order unit testing is sufficient; I'm struggling to find a valid configuration where the mount-order is *not* correctly specified in the configuration graph. Change-Id: Idc05cdf42d95e230b9906773aa2b4a3b0f075598
50 lines
1.8 KiB
Python
50 lines
1.8 KiB
Python
# Copyright 2016 Andreas Florath (andreas@florath.net)
|
|
#
|
|
# 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.
|
|
|
|
|
|
from diskimage_builder.block_device.utils import parse_abs_size_spec
|
|
from diskimage_builder.block_device.utils import parse_rel_size_spec
|
|
import testtools
|
|
|
|
|
|
class TestBlockDeviceUtils(testtools.TestCase):
|
|
"""Tests for the utils.py in the block_device dir.
|
|
|
|
This tests mostly the error and failure cases - because the good
|
|
cases are tested implicitly with the higher level unit tests.
|
|
"""
|
|
|
|
def test_parse_rel_size_with_abs(self):
|
|
"""Calls parse_rel_size_spec with an absolute number"""
|
|
|
|
is_rel, size = parse_rel_size_spec("154MiB", 0)
|
|
self.assertFalse(is_rel)
|
|
self.assertEqual(154 * 1024 * 1024, size)
|
|
|
|
def test_parse_abs_size_without_spec(self):
|
|
"""Call parse_abs_size_spec without spec"""
|
|
|
|
size = parse_abs_size_spec("198")
|
|
self.assertEqual(198, size)
|
|
|
|
def test_invalid_unit_spec(self):
|
|
"""Call parse_abs_size_spec with invalid unit spec"""
|
|
|
|
self.assertRaises(RuntimeError, parse_abs_size_spec, "747InVaLiDUnIt")
|
|
|
|
def test_broken_unit_spec(self):
|
|
"""Call parse_abs_size_spec with a completely broken unit spec"""
|
|
|
|
self.assertRaises(RuntimeError, parse_abs_size_spec, "_+!HuHi+-=")
|