BIND 10 master, updated. e40e2e96bee958e49a7bb389435add5d980419f5 Changelog for #3028

[BIND 10 source code commits]

The branch, master has been updated
       via  e40e2e96bee958e49a7bb389435add5d980419f5 (commit)
       via  0d22246092ad4822d48f5a52af5f644f5ae2f5e2 (commit)
       via  803bd5a3f260b5412a58ee61bf450211d4b4e061 (commit)
       via  078965388c8160137cfb8ddbe05104d90f3bcf31 (commit)
       via  a8bb19e3163331d8b1137869d4ddd96353d654c1 (commit)
       via  507da494700d05fe55a928ad57757a4af3d5f2cb (commit)
       via  e15d409632ae5408531051b3164c2e2b851b214e (commit)
      from  f17c3559e3353f42150d8fa742e1658285811d47 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e40e2e96bee958e49a7bb389435add5d980419f5
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Aug 22 10:45:13 2013 +0200

    Changelog for #3028

commit 0d22246092ad4822d48f5a52af5f644f5ae2f5e2
Merge: f17c355 803bd5a
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Aug 22 10:41:49 2013 +0200

    Merge #3028
    
    Remove an old stray test command.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                           |    9 +++++++--
 src/bin/cmdctl/b10-cmdctl.xml       |    2 --
 src/bin/cmdctl/cmdctl.py.in         |    2 --
 src/bin/cmdctl/cmdctl.spec.pre.in   |    5 -----
 src/bin/cmdctl/tests/cmdctl_test.py |   20 ++++++++++++++++----
 5 files changed, 23 insertions(+), 15 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 5edd274..6ef0d51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
+666.	[func]		vorner
+	The CmdCtl's command "print_settings" was removed. It served no real
+	purpose and was just experimental leftover from early development.
+	(Trac #3028, git 0d22246092ad4822d48f5a52af5f644f5ae2f5e2)
+
 665.	[doc]		stephen
 	Added the "Hook's Maintenance Guide" to the BIND 10 developer
 	documentation.
-	(Trac# 3063, git 5d1ee7b7470fc644b798ac47db1811c829f5ac24)
+	(Trac #3063, git 5d1ee7b7470fc644b798ac47db1811c829f5ac24)
 
-664.	[bug]]		tmark
+664.	[bug]		tmark
 	Corrects a bug in Hooks processing that was improperly
 	creating a new callout handle on every call, rather
 	than maintaining it throughout the context of the
diff --git a/src/bin/cmdctl/b10-cmdctl.xml b/src/bin/cmdctl/b10-cmdctl.xml
index 871265c..c66837c 100644
--- a/src/bin/cmdctl/b10-cmdctl.xml
+++ b/src/bin/cmdctl/b10-cmdctl.xml
@@ -169,8 +169,6 @@
       The configuration command is:
     </para>
 
-<!-- NOTE: print_settings is not documented since I think will be removed -->
-
     <para>
       <command>shutdown</command> exits <command>b10-cmdctl</command>.
       This has an optional <varname>pid</varname> argument to
diff --git a/src/bin/cmdctl/cmdctl.py.in b/src/bin/cmdctl/cmdctl.py.in
index 0b402fe..ea56da9 100755
--- a/src/bin/cmdctl/cmdctl.py.in
+++ b/src/bin/cmdctl/cmdctl.py.in
@@ -370,8 +370,6 @@ class CommandControl():
             self._httpserver.shutdown()
             self._serving = False
 
-        elif command == 'print_settings':
-            answer = ccsession.create_answer(0, self._cmdctl_config_data)
         else:
             answer = ccsession.create_answer(1, 'unknown command: ' + command)
 
diff --git a/src/bin/cmdctl/cmdctl.spec.pre.in b/src/bin/cmdctl/cmdctl.spec.pre.in
index d04e2e3..87aeb11 100644
--- a/src/bin/cmdctl/cmdctl.spec.pre.in
+++ b/src/bin/cmdctl/cmdctl.spec.pre.in
@@ -24,11 +24,6 @@
     ],
     "commands": [
       {
-        "command_name": "print_settings",
-        "command_description": "Print some_string and some_int to stdout",
-        "command_args": []
-      },
-      {
         "command_name": "shutdown",
         "command_description": "shutdown cmdctl",
         "command_args": [
diff --git a/src/bin/cmdctl/tests/cmdctl_test.py b/src/bin/cmdctl/tests/cmdctl_test.py
index dfd66ad..7af8b0d 100644
--- a/src/bin/cmdctl/tests/cmdctl_test.py
+++ b/src/bin/cmdctl/tests/cmdctl_test.py
@@ -462,10 +462,22 @@ class TestCommandControl(unittest.TestCase):
         answer = self.cmdctl.command_handler('unknown-command', None)
         self._check_answer(answer, 1, 'unknown command: unknown-command')
 
-        answer = self.cmdctl.command_handler('print_settings', None)
+        # Send a real command. Mock stuff so the shutdown command doesn't
+        # cause an exception.
+        class ModuleCC:
+            def send_stopping():
+                pass
+        self.cmdctl._module_cc = ModuleCC
+        called = []
+        class Server:
+            def shutdown():
+                called.append('shutdown')
+        self.cmdctl._httpserver = Server
+        answer = self.cmdctl.command_handler('shutdown', None)
         rcode, msg = ccsession.parse_answer(answer)
         self.assertEqual(rcode, 0)
-        self.assertTrue(msg != None)
+        self.assertIsNone(msg)
+        self.assertEqual(['shutdown'], called)
 
     def test_command_handler_spec_update(self):
         # Should not be present
@@ -543,10 +555,10 @@ class TestCommandControl(unittest.TestCase):
         self.assertEqual(1, rcode)
 
         # Send a command to cmdctl itself.  Should be the same effect.
-        rcode, value = self.cmdctl.send_command('Cmdctl', 'print_settings',
+        rcode, value = self.cmdctl.send_command('Cmdctl', 'shutdown',
                                                 None)
         self.assertEqual(2, len(self.cmdctl.sent_messages))
-        self.assertEqual(({'command': ['print_settings']}, 'Cmdctl'),
+        self.assertEqual(({'command': ['shutdown']}, 'Cmdctl'),
                          self.cmdctl.sent_messages[-1])
         self.assertEqual(1, rcode)