GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-30 11:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

binman: Tidy up some comments in the tests

Browse source 
A few lines are commented out and can be removed. Also fix return-value
docs for _DoReadFile() and _DoReadFileDtb().

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2018-07-17 13:25:27 -06:00
parent b2b0df8f39
commit ea6922e3d6
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/binman/ftest.py
View file

@ -212,6 +212,7 @@ class TestFunctional(unittest.TestCase):
Resulting image contents Resulting image contents
Device tree contents Device tree contents
Map data showing contents of image (or None if none) Map data showing contents of image (or None if none)
Output device tree binary filename ('u-boot.dtb' path)
""" """
dtb_data = None dtb_data = None
# Use the compiled test file as the u-boot-dtb input # Use the compiled test file as the u-boot-dtb input
@ -249,6 +250,9 @@ class TestFunctional(unittest.TestCase):
the u-boot-dtb entry. Normally this is not needed and the the u-boot-dtb entry. Normally this is not needed and the
test contents (the U_BOOT_DTB_DATA string) can be used. test contents (the U_BOOT_DTB_DATA string) can be used.
But in some test we need the real contents. But in some test we need the real contents.
Returns:
Resulting image contents
""" """
return self._DoReadFileDtb(fname, use_real_dtb)[0] return self._DoReadFileDtb(fname, use_real_dtb)[0]
@ -312,7 +316,6 @@ class TestFunctional(unittest.TestCase):
def AddNode(node, path): def AddNode(node, path):
if node.name != '/': if node.name != '/':
path += '/' + node.name path += '/' + node.name
#print 'path', path
for subnode in node.subnodes: for subnode in node.subnodes:
for prop in subnode.props.values(): for prop in subnode.props.values():
if prop.name in node_names: if prop.name in node_names:
@ -408,7 +411,6 @@ class TestFunctional(unittest.TestCase):
with self.assertRaises(Exception) as e: with self.assertRaises(Exception) as e:
result = self._RunBinman('-d', result = self._RunBinman('-d',
self.TestFile('04_invalid_entry.dts')) self.TestFile('04_invalid_entry.dts'))
#print e.exception
self.assertIn("Unknown entry type 'not-a-valid-type' in node " self.assertIn("Unknown entry type 'not-a-valid-type' in node "
"'/binman/not-a-valid-type'", str(e.exception)) "'/binman/not-a-valid-type'", str(e.exception))