BIND 10 trac2641_3, updated. 2b9c6a45464d5c064012984665bd3141c4aded27 [2641] Add test for _is_session_valid()

[BIND 10 source code commits]

The branch, trac2641_3 has been updated
       via  2b9c6a45464d5c064012984665bd3141c4aded27 (commit)
      from  77520e9dda0fc9cac5bbd8bdf7225ecc52bd8ed5 (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 2b9c6a45464d5c064012984665bd3141c4aded27
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Feb 19 12:03:38 2013 +0530

    [2641] Add test for _is_session_valid()
    
    This commit was actually to update the statement inside
    _is_session_valid() to be a None check, but I've written a unittest for
    it anyway.

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

Summary of changes:
 src/bin/cmdctl/cmdctl.py.in         |    5 ++++-
 src/bin/cmdctl/tests/cmdctl_test.py |    8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/cmdctl/cmdctl.py.in b/src/bin/cmdctl/cmdctl.py.in
index 8d8d6cd..625d853 100755
--- a/src/bin/cmdctl/cmdctl.py.in
+++ b/src/bin/cmdctl/cmdctl.py.in
@@ -97,6 +97,9 @@ def check_file(file_name):
 class SecureHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
     '''https connection request handler.
     Currently only GET and POST are supported.  '''
+    def __init__(self):
+        self.session_id = None
+
     def do_GET(self):
         '''The client should send its session id in header with
         the name 'cookie'
@@ -121,7 +124,7 @@ class SecureHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
         return self.server.get_reply_data_for_GET(id, module)
 
     def _is_session_valid(self):
-        return self.session_id
+        return self.session_id is not None
 
     def _is_user_logged_in(self):
         login_time = self.server.user_sessions.get(self.session_id)
diff --git a/src/bin/cmdctl/tests/cmdctl_test.py b/src/bin/cmdctl/tests/cmdctl_test.py
index fae6e46..3d2edde 100644
--- a/src/bin/cmdctl/tests/cmdctl_test.py
+++ b/src/bin/cmdctl/tests/cmdctl_test.py
@@ -33,7 +33,7 @@ BUILD_FILE_PATH = os.environ['CMDCTL_BUILD_PATH'] + os.sep
 # Rewrite the class for unittest.
 class MySecureHTTPRequestHandler(SecureHTTPRequestHandler):
     def __init__(self):
-        pass
+        self.session_id = None
 
     def send_response(self, rcode):
         self.rcode = rcode
@@ -101,6 +101,12 @@ class TestSecureHTTPRequestHandler(unittest.TestCase):
         self.handler.rfile.close()
         os.remove('check.tmp')
 
+    def test_is_session_valid(self):
+        self.assertIsNone(self.handler.session_id)
+        self.assertFalse(self.handler._is_session_valid())
+        self.handler.session_id = 4234
+        self.assertTrue(self.handler._is_session_valid())
+
     def test_parse_request_path(self):
         self.handler.path = ''
         mod, cmd = self.handler._parse_request_path()