diff options
| -rw-r--r-- | tools/binman/ftest.py | 5 | ||||
| -rw-r--r-- | tools/buildman/func_test.py | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 5812ab397c..b0832da08a 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 bc32f61733..eec0f9bd37 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) |