tests/usage: test for --help consistency

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/usage.py b/python/samba/tests/usage.py
index d0371fbec17497dd38d59cecfac759d6baea1072..ba18a3e07290f187afd98bf2660cf1195664baea 100644 (file)
--- a/python/samba/tests/usage.py
+++ b/python/samba/tests/usage.py
@@ -17,7 +17,7 @@
 import os
 import sys
 import subprocess
-from samba.tests import TestCase
+from samba.tests import TestCase, check_help_consistency
 from unittest import TestSuite
 import re
 import stat
@@ -256,6 +256,7 @@ class HelpTestSuper(TestCase):
     and exit with success.
     """
     check_return_code = True
+    check_consistency = True
     check_contains_usage = True
     check_multiline = True
     check_merged_out_and_err = False
@@ -319,6 +320,12 @@ class HelpTestSuper(TestCase):
                     #    * and return success.
                     #print(out.encode('utf8'))
                     #print(err.encode('utf8'))
+                    if self.check_consistency:
+                        errors = check_help_consistency(out,
+                                                        self.options_start,
+                                                        self.options_end)
+                        if errors is not None:
+                            self.fail(errors)
 
                     if self.check_return_code:
                         self.assertEqual(p.returncode, 0,

diff --git a/selftest/knownfail.d/usage b/selftest/knownfail.d/usage
index d3cfc6d03aec7a7e5f7fd22d6173d69a93d9fb1e..ef2d83e3038e57dde91f96ab94889d8dd163a763 100644 (file)
--- a/selftest/knownfail.d/usage
+++ b/selftest/knownfail.d/usage
@@ -1,3 +1,10 @@
+samba.tests.usage.samba.tests.usage.ElfHelpTests.test_ldbadd.none.
+samba.tests.usage.samba.tests.usage.ElfHelpTests.test_ldbdel.none.
+samba.tests.usage.samba.tests.usage.ElfHelpTests.test_ldbedit.none.
+samba.tests.usage.samba.tests.usage.ElfHelpTests.test_ldbmodify.none.
+samba.tests.usage.samba.tests.usage.ElfHelpTests.test_ldbrename.none.
+samba.tests.usage.samba.tests.usage.ElfHelpTests.test_ldbsearch.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_autobuild_py.none.
 samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_autoidl.none.
 samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_compare_cc_results_py.none.
 samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_config_base.none.