diff options
| -rw-r--r-- | tools/binman/entry_test.py | 4 | ||||
| -rw-r--r-- | tools/binman/ftest.py | 4 | ||||
| -rw-r--r-- | tools/binman/image.py | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py index 8a9ae017f0..85c4196892 100644 --- a/tools/binman/entry_test.py +++ b/tools/binman/entry_test.py @@ -9,16 +9,16 @@ import collections import unittest -import entry - class TestEntry(unittest.TestCase): def testEntryContents(self): """Test the Entry bass class""" + import entry base_entry = entry.Entry(None, None, None, read_node=False) self.assertEqual(True, base_entry.ObtainContents()) def testUnknownEntry(self): """Test that unknown entry types are detected""" + import entry Node = collections.namedtuple('Node', ['name', 'path']) node = Node('invalid-name', 'invalid-path') with self.assertRaises(ValueError) as e: diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index c4207ce5d2..eae1ab1c4b 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -20,7 +20,6 @@ import binman import cmdline import command import control -import entry import fdt import fdt_util import tools @@ -56,6 +55,9 @@ class TestFunctional(unittest.TestCase): """ @classmethod def setUpClass(self): + global entry + import entry + # Handle the case where argv[0] is 'python' self._binman_dir = os.path.dirname(os.path.realpath(sys.argv[0])) self._binman_pathname = os.path.join(self._binman_dir, 'binman') diff --git a/tools/binman/image.py b/tools/binman/image.py index 07fc930665..24c4f6f578 100644 --- a/tools/binman/image.py +++ b/tools/binman/image.py @@ -9,8 +9,6 @@ from collections import OrderedDict from operator import attrgetter -import entry -from entry import Entry import fdt_util import tools @@ -48,6 +46,11 @@ class Image: _entries: OrderedDict() of entries """ def __init__(self, name, node): + global entry + global Entry + import entry + from entry import Entry + self._node = node self._name = name self._size = None |