X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=test.py;h=bb2b40c568a31c1ad79ec283c477feb65f4f5d34;hb=b269d59a79016ce79941b64d15fcd6453cc7ddd5;hp=ba3132b14689efa63c8164331bf702c74716253a;hpb=7cb6ba6bfc1dfae2be3ef0047dfeaabc87b81df7;p=python-musicpd.git

diff --git a/test.py b/test.py
index ba3132b..bb2b40c 100755
--- a/test.py
+++ b/test.py
@@ -70,6 +70,20 @@ class testEnvVar(unittest.TestCase):
             client = musicpd.MPDClient()
             self.assertEqual(client.host, '/run/user/1000/mpd/socket')
 
+        # Test MPD_TIMEOUT
+        os.environ.pop('MPD_TIMEOUT', None)
+        client = musicpd.MPDClient()
+        self.assertEqual(client.mpd_timeout, musicpd.CONNECTION_TIMEOUT)
+        os.environ['MPD_TIMEOUT'] = 'garbage'
+        client = musicpd.MPDClient()
+        self.assertEqual(client.mpd_timeout,
+                         musicpd.CONNECTION_TIMEOUT,
+                         'Garbage\'s not silently ignore to use default value')
+        os.environ['MPD_TIMEOUT'] = '42'
+        client = musicpd.MPDClient()
+        self.assertEqual(client.mpd_timeout, 42)
+
+
 class TestMPDClient(unittest.TestCase):
 
     longMessage = True
@@ -223,15 +237,14 @@ class TestMPDClient(unittest.TestCase):
 
     def MPDWillReturnBinary(self, lines):
         data = bytearray(b''.join(lines))
-        print(data)
 
-        def recv(amount):
+        def read(amount):
             val = bytearray()
             while amount > 0:
                 amount -= 1
-                _ = data.pop(0)
-                print(hex(_))
-                val.append(_)
+                # _ = data.pop(0)
+                # print(hex(_))
+                val.append(data.pop(0))
             return val
 
         def readline():
@@ -240,7 +253,7 @@ class TestMPDClient(unittest.TestCase):
                 val.append(data.pop(0))
             return val
         self.client._rbfile.readline.side_effect = readline
-        self.client._rbfile.recv.side_effect = recv
+        self.client._rbfile.read.side_effect = read
 
     def assertMPDReceived(self, *lines):
         self.client._wfile.write.assert_called_with(*lines)