1 files changed, 63 insertions, 8 deletions

diff --git a/source4/scripting/python/samba/tests/netcmd.py b/source4/scripting/python/samba/tests/netcmd.py
index 787bcd5a72..2cbac4e8bf 100644
--- a/source4/scripting/python/samba/tests/netcmd.py
+++ b/source4/scripting/python/samba/tests/netcmd.py
@@ -1,7 +1,5 @@
-#!/usr/bin/env python
-
 # Unix SMB/CIFS implementation.
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2009
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2009-2011
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,17 +17,74 @@
 
 """Tests for samba.netcmd."""
 
+from cStringIO import StringIO
 from samba.netcmd import Command
+from samba.netcmd.testparm import cmd_testparm
+from samba.netcmd.main import cmd_sambatool
 import samba.tests
 
-class CommandTests(samba.tests.TestCase):
+class NetCmdTestCase(samba.tests.TestCase):
+
+    def run_netcmd(self, cmd_klass, args, retcode=0):
+        cmd = cmd_klass(outf=StringIO(), errf=StringIO())
+        try:
+            retval = cmd._run(cmd_klass.__name__, *args)
+        except Exception, e:
+            cmd.show_command_error(e)
+            retval = 1
+        self.assertEquals(retcode, retval)
+        return cmd.outf.getvalue(), cmd.errf.getvalue()
+
+    def iter_all_subcommands(self):
+        todo = []
+        todo.extend(cmd_sambatool.subcommands.items())
+        while todo:
+            (path, cmd) = todo.pop()
+            yield path, cmd
+            subcmds = getattr(cmd, "subcommands", {})
+            todo.extend([(path + " " + k, v) for (k, v) in
+                subcmds.iteritems()])
+
+
+class TestParmTests(NetCmdTestCase):
+
+    def test_no_client_ip(self):
+        out, err = self.run_netcmd(cmd_testparm, ["--client-name=foo"],
+            retcode=-1)
+        self.assertEquals("", out)
+        self.assertEquals(
+            "ERROR: Both a DNS name and an IP address are "
+            "required for the host access check\n", err)
+
+
+class CommandTests(NetCmdTestCase):
+
+    def test_description(self):
+        class cmd_foo(Command):
+            """Mydescription"""
+        self.assertEquals("Mydescription", cmd_foo().short_description)
 
     def test_name(self):
         class cmd_foo(Command):
             pass
         self.assertEquals("foo", cmd_foo().name)
 
-    def test_description(self):
-        class cmd_foo(Command):
-            """Mydescription"""
-        self.assertEquals("Mydescription", cmd_foo().description)
+    def test_synopsis_everywhere(self):
+        missing = []
+        for path, cmd in self.iter_all_subcommands():
+            if cmd.synopsis is None:
+                missing.append(path)
+        if missing:
+            self.fail("The following commands do not have a synopsis set: %r" %
+                    missing)
+
+    def test_short_description_everywhere(self):
+        missing = []
+        for path, cmd in self.iter_all_subcommands():
+            if cmd.short_description is None:
+                missing.append(path)
+        if not missing:
+            return
+        self.fail(
+            "The following commands do not have a short description set: %r" %
+                missing)