Fix tests

Author: kasemir

Test/test_table_scan.py

@@ -156,7 +156,7 @@ def testScanSettings(self):
           ]
         )
         cmds = handle(table_scan)
-        self.assertEqual(str(cmds), "[Set('X', 1.0), Set('Motor1', 2.0, completion=True, readback='Motor1.RBV', timeout=100)]")
+        self.assertEqual(str(cmds), "[Set('X', 1.0), Set('Motor1', 2.0, completion=True, timeout=100, readback='Motor1.RBV', tolerance=0.100000)]")
 
 
         print "\n=== Override ScanSettings for Motor ==="
@@ -167,7 +167,7 @@ def testScanSettings(self):
           ]
         )
         cmds = handle(table_scan)
-        self.assertEqual(str(cmds), "[Set('Motor1', 1.0, completion=True, readback='Motor1.RBV', timeout=100), Set('Motor2', 2.0)]")
+        self.assertEqual(str(cmds), "[Set('Motor1', 1.0, completion=True, timeout=100, readback='Motor1.RBV', tolerance=0.100000), Set('Motor2', 2.0)]")
 
 
     def testParallel(self):

scan/commands/set.py

@@ -120,10 +120,11 @@ def __repr__(self):
             result += ", %s" % str(self.__value)
         if self.__completion:
             result += ', completion=True'
-            result += ', timeout='+str(self.__timeout)
+            if self.__timeout!=0.0:
+                result += ', timeout='+str(self.__timeout)
         if isinstance(self.__readback, str):
             result += ", readback='%s'" % self.__readback
-            result += ", tolerance='%f'" % self.__tolerance
+            result += ", tolerance=%f" % self.__tolerance
             if not self.__completion and  self.__timeout!=0.0:
                 result += ', timeout='+str(self.__timeout)
         elif self.__readback: