sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

tests/usage: test for --help consistency

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2019-06-27 16:57:22 +12:00 committed by Andrew Bartlett
parent 272a6c3c30
commit 9fc8e2a6d0
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/samba/tests/usage.py
View File

@ -17,7 +17,7 @@
import os import os
import sys import sys
import subprocess import subprocess
from samba.tests import TestCase from samba.tests import TestCase, check_help_consistency
from unittest import TestSuite from unittest import TestSuite
import re import re
import stat import stat
@ -256,6 +256,7 @@ class HelpTestSuper(TestCase):
and exit with success. and exit with success.
""" """
check_return_code = True check_return_code = True
check_consistency = True
check_contains_usage = True check_contains_usage = True
check_multiline = True check_multiline = True
check_merged_out_and_err = False check_merged_out_and_err = False
@ -319,6 +320,12 @@ class HelpTestSuper(TestCase):
# * and return success. # * and return success.
#print(out.encode('utf8')) #print(out.encode('utf8'))
#print(err.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: if self.check_return_code:
self.assertEqual(p.returncode, 0, self.assertEqual(p.returncode, 0,

7
selftest/knownfail.d/usage
View File

@ -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_autoidl.none.
samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_compare_cc_results_py.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. samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_config_base.none.