summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2019-06-27 16:57:22 +1200
committerAndrew Bartlett <abartlet@samba.org>2019-07-05 01:05:20 +0000
commit854e554c99064b111bf60ce036c223a7394340e9 (patch)
treedfdc199e23d9fec188836344878aff2ef44fd207
parent075bf608369896e1f1475a6ecb99118637c73698 (diff)
downloadsamba-854e554c99064b111bf60ce036c223a7394340e9.tar.gz
tests/usage: python scripts --help should be helpful
We want to be sure it says *something* and returns success. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--python/samba/tests/usage.py67
-rw-r--r--selftest/knownfail.d/usage14
2 files changed, 81 insertions, 0 deletions
diff --git a/python/samba/tests/usage.py b/python/samba/tests/usage.py
index 30c083076ff..cffec363386 100644
--- a/python/samba/tests/usage.py
+++ b/python/samba/tests/usage.py
@@ -85,6 +85,12 @@ EXCLUDE_USAGE = {
'python/samba/tests/dcerpc/raw_protocol.py'
}
+EXCLUDE_HELP = {
+ 'selftest/tap2subunit',
+ 'wintest/test-s3.py',
+ 'wintest/test-s4-howto.py',
+}
+
EXCLUDE_DIRS = {
'source3/script/tests',
@@ -202,4 +208,65 @@ class PythonScriptUsageTests(TestCase):
setattr(cls, 'test_%s' % name, _f)
+class PythonScriptHelpTests(TestCase):
+ """Python scripts run with -h or --help should print a help string,
+ and exit with success.
+ """
+
+ @classmethod
+ def initialise(cls):
+ for name, filename in python_script_iterator():
+ # We add the actual tests after the class definition so we
+ # can give individual names to them, so we can have a
+ # knownfail list.
+ fn = filename.replace(BASEDIR, '').lstrip('/')
+
+ if fn in EXCLUDE_HELP:
+ print("skipping %s (EXCLUDE_HELP)" % filename)
+ continue
+
+ if os.path.dirname(fn) in EXCLUDE_DIRS:
+ print("skipping %s (EXCLUDE_DIRS)" % filename)
+ continue
+
+ def _f(self, filename=filename):
+ print(filename)
+ for h in ('--help', '-h'):
+ try:
+ p = subprocess.Popen(['python3', filename, h],
+ stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE)
+ out, err = p.communicate(timeout=5)
+ except OSError as e:
+ self.fail("Error: %s" % e)
+ except subprocess.SubprocessError as e:
+ self.fail("Subprocess error: %s" % e)
+
+ err = err.decode('utf-8')
+ out = out.decode('utf-8').lower()
+
+ # NOTE:
+ # These assertions are heuristics, not policy.
+ # If your script fails this test when it shouldn't
+ # just add it to EXCLUDE_HELP above or change the
+ # heuristic.
+
+ # --help should produce:
+ # * multiple lines of help on stdout (not stderr),
+ # * including a "Usage:" string,
+ # * and return success.
+
+ self.assertEqual(p.returncode, 0,
+ "returncode should be zero")
+ self.assertIn('usage', out,
+ ('lacks "Usage:"\n'
+ 'stdout:\n%s\nstderr:\n%s' % (out, err)))
+ self.assertIn('\n', out,
+ ('should be multi-line'
+ 'stdout:\n%s\nstderr:\n%s' % (out, err)))
+
+ setattr(cls, 'test_%s' % name, _f)
+
+
PythonScriptUsageTests.initialise()
+PythonScriptHelpTests.initialise()
diff --git a/selftest/knownfail.d/usage b/selftest/knownfail.d/usage
index 222f2da1bec..f4a52dad822 100644
--- a/selftest/knownfail.d/usage
+++ b/selftest/knownfail.d/usage
@@ -1,3 +1,17 @@
+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.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_ctdb_etcd_lock.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_depfilter_py.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_dns_hub_py.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_gen_hresult_py.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_mymachinepw.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_repl_cleartext_pwd_py.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_run_py.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_run_py_.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_smbstatus.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_tests_py.none.
+samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_waf.none.
samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_chgtdcpass.none.
samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_findprovisionusnranges.none.
samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_rebuildextendeddn.none.