[svn] commit: r1868 - /trunk/src/bin/cmdctl/tests/cmdctl_test.py

[BIND 10 source code commits]

Author: jelte
Date: Thu May 20 09:08:41 2010
New Revision: 1868

Log:
fixed the failing tests for cmdctl

Modified:
    trunk/src/bin/cmdctl/tests/cmdctl_test.py

Modified: trunk/src/bin/cmdctl/tests/cmdctl_test.py
==============================================================================
--- trunk/src/bin/cmdctl/tests/cmdctl_test.py (original)
+++ trunk/src/bin/cmdctl/tests/cmdctl_test.py Thu May 20 09:08:41 2010
@@ -51,9 +51,8 @@
 
 class MyCommandControl(CommandControl):
     def __init__(self):
-        self.command_spec = {}
-        self.config_spec = {}
         self.config_data = {}
+        self.module_spec = {}
 
     def send_command(self, mod, cmd, param):
         return 0, {}
@@ -120,7 +119,7 @@
     def test_do_GET_3(self):
         self.handler.headers['cookie'] = 12346
         self.handler.server.user_sessions[12346] = time.time() + 1000000
-        path_vec = ['command_spec', 'config_data', 'config_spec']
+        path_vec = ['config_data', 'module_spec']
         for path in path_vec:
             self.handler.path = '/' + path
             self.handler.do_GET()
@@ -245,8 +244,8 @@
         os.remove('check.tmp')
 
         self.handler.path = '/module/command'
-        self.handler.server.cmdctrl.command_spec = {}
-        self.handler.server.cmdctrl.command_spec['module'] = [{'command_name':'command'}, {'command_name': ['data1']} ]
+        self.handler.server.cmdctrl.module_spec = {}
+        self.handler.server.cmdctrl.module_spec['module'] = { 'commands': [{'command_name':'command'}, {'command_name': ['data1']} ] }
         rcode, reply = self.handler._handle_post_request()
         self.assertEqual(http.client.OK, rcode)