aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-01-16 15:29:50 -0500
committerTom Rini <trini@konsulko.com>2018-01-16 16:15:25 -0500
commit3759df0c0810636b31fe64c56868aa831514e509 (patch)
treee0716dec146d7a15295e6e6d0d645d3f8f5bc676 /tools
parent23b4cf32b7ed9e2cd35638878d7c9ccd7537c7ba (diff)
downloadu-boot-3759df0c0810636b31fe64c56868aa831514e509.zip
u-boot-3759df0c0810636b31fe64c56868aa831514e509.tar.gz
u-boot-3759df0c0810636b31fe64c56868aa831514e509.tar.bz2
tools: Update python "help" tests to cope with "more" oddities
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/binman/ftest.py5
-rw-r--r--tools/buildman/func_test.py5
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 5812ab3..b0832da 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -290,7 +290,10 @@ class TestFunctional(unittest.TestCase):
"""Test that the full help is displayed with -H"""
result = self._RunBinman('-H')
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, result.return_code)
diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py
index bc32f61..eec0f9b 100644
--- a/tools/buildman/func_test.py
+++ b/tools/buildman/func_test.py
@@ -231,7 +231,10 @@ class TestFunctional(unittest.TestCase):
command.test_result = None
result = self._RunBuildman('-H')
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, result.return_code)