Added more tests.

Author: rshipp

tests/mockserver.py

@@ -1,10 +1,12 @@
 """A simple mock NUT server for testing the Python client."""
 
 class MockServer(object):
-    def __init__(self, host=None, port=None, broken=False, ok=True):
+    def __init__(self, host=None, port=None, broken=True, ok=True,
+            broken_username=False):
         self.valid = "test"
         self.broken = broken
         self.ok = ok
+        self.broken_username = broken_username
 
     def write(self, text):
         self.command = text
@@ -17,7 +19,9 @@ def close(self):
         pass
 
     def run_command(self):
-        if self.broken == True:
+        if self.broken and not self.broken_username and self.command == "USERNAME %s\n" % self.valid:
+            return 'OK\n'
+        elif self.broken:
             return 'ERR\n'
         elif self.command == "HELP\n":
             return 'Commands: HELP VER GET LIST SET INSTCMD LOGIN LOGOUT USERNAME PASSWORD STARTTLS\n'

tests/testclient.py

@@ -12,11 +12,12 @@ class TestClient(unittest.TestCase):
 
     def setUp(self):
         self.client = PyNUTClient(connect=False, debug=True)
-        self.client._srv_handler = MockServer()
+        self.client._srv_handler = MockServer(broken=False)
         self.broken_client = PyNUTClient(connect=False, debug=True)
         self.broken_client._srv_handler = MockServer(broken=True)
         self.not_ok_client = PyNUTClient(connect=False, debug=True)
-        self.not_ok_client._srv_handler = MockServer(ok=False)
+        self.not_ok_client._srv_handler = MockServer(ok=False,
+                broken=False)
         self.valid = "test"
         self.invalid = "does_not_exist"
         self.valid_ups_name = "Test UPS 1"
@@ -46,8 +47,13 @@ def test_connect_debug(self):
         except Exception:
             assert(False)
 
+    def test_connect_broken(self):
+        telnetlib.Telnet = MockServer
+        client = PyNUTClient(login=self.valid, password=self.valid,
+                connect=False)
+        self.assertRaises(PyNUTError, client._connect)
+
     def test_connect_credentials(self):
-        # FIXME: Mock the __gettem__ call, so this can be fully tested.
         try:
             PyNUTClient(login=self.valid, password=self.valid)
         except TypeError:
@@ -57,6 +63,18 @@ def test_connect_credentials(self):
         except Exception:
             assert(False)
 
+    def test_connect_credentials_username_ok(self):
+        try:
+            telnetlib.Telnet = MockServer
+            PyNUTClient(login=self.valid, password=self.valid,
+                    debug=True)
+        except TypeError:
+            pass
+        except PyNUTError:
+            pass
+        except Exception:
+            assert(False)
+
     def test_get_ups_list(self):
         ups_list = self.client.list_ups()
         self.assertEquals(type(ups_list), dict)