- real "No timeout" implementation

- remove some messages so that default message from unit test is shown

2 files changed, 6 insertions, 6 deletions

diff --git a/pyserial/examples/test_high_load.py b/pyserial/examples/test_high_load.py
index 4e2e35b..4e15626 100644
--- a/pyserial/examples/test_high_load.py
+++ b/pyserial/examples/test_high_load.py
@@ -54,8 +54,8 @@ class TestHighLoad(unittest.TestCase):
         for i in range(self.N):
             q = bytes_0to255
             self.s.write(q)
-            self.failUnless(self.s.read(len(q))==q, "expected a '%s' which was written before" % q)
-        self.failUnless(self.s.inWaiting()==0, "expected empty buffer after all sent chars are read")
+            self.failUnlessEqual(self.s.read(len(q)), q) # expected same which was written before
+        self.failUnlessEqual(self.s.inWaiting(), 0) # expected empty buffer after all sent chars are read
 
     def test1_WriteWriteReadLoopback(self):
         """Send big strings, multiple write one read."""
@@ -63,8 +63,8 @@ class TestHighLoad(unittest.TestCase):
         for i in range(self.N):
             self.s.write(q)
         read = self.s.read(len(q)*self.N)
-        self.failUnless(read==q*self.N, "expected what was written before. got %d bytes, expected %d" % (len(read), self.N*len(q)))
-        self.failUnless(self.s.inWaiting()==0, "expected empty buffer after all sent chars are read")
+        self.failUnlessEqual(read, q*self.N, "expected what was written before. got %d bytes, expected %d" % (len(read), self.N*len(q)))
+        self.failUnlessEqual(self.s.inWaiting(), 0) # "expected empty buffer after all sent chars are read")
 
 
 if __name__ == '__main__':
diff --git a/pyserial/serial/loopback_connection.py b/pyserial/serial/loopback_connection.py
index 178aae1..a87c6ea 100644
--- a/pyserial/serial/loopback_connection.py
+++ b/pyserial/serial/loopback_connection.py
@@ -98,7 +98,7 @@ class LoopbackSerial(SerialBase):
         if self._timeout is not None:
             timeout = time.time() + self._timeout
         else:
-            timeout = time.time() + 9999999 # ok.. thats just long...
+            timeout = None
         while len(data) < size:
             self.buffer_lock.acquire()
             try:
@@ -109,7 +109,7 @@ class LoopbackSerial(SerialBase):
             data += block
             # check for timeout now, after data has been read.
             # useful for timeout = 0 (non blocking) read
-            if time.time() > timeout:
+            if timeout and time.time() > timeout:
                 break
         return bytes(data)