leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: Update python "help" tests to cope with "more" oddities

Browse Source 
In some cases when "more" is told to page a given file it will prepend
the output with:
::::::::::::::
/PATH/TO/THE/FILE
::::::::::::::

And when this happens the output will not match the expected length.
Further, if we use a different pager we will instead fail the coverage
tests as we will not have 100% coverage.  Update the help test to remove
the string in question.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2018-01-16 15:29:50 -05:00
parent 23b4cf32b7
commit 3759df0c08
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/binman/ftest.py
View File

@ -290,7 +290,10 @@ class TestFunctional(unittest.TestCase):
"""Test that the full help is displayed with -H""" """Test that the full help is displayed with -H"""
result = self._RunBinman('-H') result = self._RunBinman('-H')
help_file = os.path.join(self._binman_dir, 'README') help_file = os.path.join(self._binman_dir, 'README')
self.assertEqual(len(result.stdout), os.path.getsize(help_file)) # Remove possible extraneous strings
extra = '::::::::::::::\n' + help_file + '\n::::::::::::::\n'
gothelp = result.stdout.replace(extra, '')
self.assertEqual(len(gothelp), os.path.getsize(help_file))
self.assertEqual(0, len(result.stderr)) self.assertEqual(0, len(result.stderr))
self.assertEqual(0, result.return_code) self.assertEqual(0, result.return_code)

5
tools/buildman/func_test.py
View File

@ -231,7 +231,10 @@ class TestFunctional(unittest.TestCase):
command.test_result = None command.test_result = None
result = self._RunBuildman('-H') result = self._RunBuildman('-H')
help_file = os.path.join(self._buildman_dir, 'README') help_file = os.path.join(self._buildman_dir, 'README')
self.assertEqual(len(result.stdout), os.path.getsize(help_file)) # Remove possible extraneous strings
extra = '::::::::::::::\n' + help_file + '\n::::::::::::::\n'
gothelp = result.stdout.replace(extra, '')
self.assertEqual(len(gothelp), os.path.getsize(help_file))
self.assertEqual(0, len(result.stderr)) self.assertEqual(0, len(result.stderr))
self.assertEqual(0, result.return_code) self.assertEqual(0, result.return_code)