Return True, not 'OK'.

Updated tests to match.

Author: rshipp

nut2.py

@@ -276,11 +276,12 @@ def set_var(self, ups="", var="", value=""):
         The variable must be a writable value (cf list_rw_vars) and you
         must have the proper rights to set it (maybe login/password).
         """
+        logging.debug("set_var '%s' from '%s' to '%s'", var, ups, value)
 
         self._srv_handler.write("SET VAR %s %s %s\n" % (ups, var, value))
         result = self._srv_handler.read_until("\n")
         if result == "OK\n":
-            return "OK"
+            return True
         else:
             raise PyNUTError(result)
 
@@ -295,7 +296,7 @@ def run_command(self, ups="", command=""):
         self._srv_handler.write("INSTCMD %s %s\n" % (ups, command))
         result = self._srv_handler.read_until("\n")
         if result == "OK\n":
-            return "OK"
+            return True
         else:
             raise PyNUTError(result.replace("\n", ""))
 
@@ -316,7 +317,7 @@ def fsd(self, ups=""):
         self._srv_handler.write("FSD %s\n" % ups)
         result = self._srv_handler.read_until("\n")
         if result == "OK FSD-SET\n":
-            return "OK"
+            return True
         else:
             raise PyNUTError(result.replace("\n", ""))
 

tests/testclient.py

@@ -118,8 +118,7 @@ def test_get_rw_vars_invalid_ups(self):
         self.assertRaises(PyNUTError, self.client.list_rw_vars, self.invalid)
 
     def test_set_rw_var_valid(self):
-        self.assertEquals(self.client.set_var(self.valid, self.valid,
-                    self.valid), 'OK')
+        assert(self.client.set_var(self.valid, self.valid, self.valid))
 
     def test_set_rw_var_invalid(self):
         self.assertRaises(PyNUTError, self.client.set_var, self.invalid,
@@ -130,8 +129,7 @@ def test_set_rw_var_broken(self):
                 self.valid, self.valid)
 
     def test_run_ups_command_valid(self):
-        self.assertEquals(self.client.run_command(self.valid,
-                    self.valid), 'OK')
+        assert(self.client.run_command(self.valid, self.valid))
 
     def test_run_ups_command_invalid(self):
         self.assertRaises(PyNUTError, self.client.run_command, self.invalid,
@@ -142,7 +140,7 @@ def test_run_ups_command_broken(self):
                     self.valid)
 
     def test_fsd_valid_ups(self):
-        self.assertEquals(self.client.fsd(self.valid), 'OK')
+        assert(self.client.fsd(self.valid))
 
     def test_fsd_invalid_ups(self):
         self.assertRaises(PyNUTError, self.client.fsd, self.invalid)