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

diff --git a/test.py b/test.py
index ba3132b..ad3d471 100755
--- a/test.py
+++ b/test.py
@@ -36,24 +36,35 @@ TEST_MPD_HOST, TEST_MPD_PORT = ('example.com', 10000)
 class testEnvVar(unittest.TestCase):
 
     def test_envvar(self):
-        os.environ.pop('MPD_HOST', None)
-        os.environ.pop('MPD_PORT', None)
-        client = musicpd.MPDClient()
-        self.assertEqual(client.host, 'localhost')
-        self.assertEqual(client.port, '6600')
+        # mock "os.path.exists" here to ensure there are no socket in
+        # XDG_RUNTIME_DIR/mpd or /run/mpd since with test defaults fallbacks
+        # when :
+        #   * neither MPD_HOST nor XDG_RUNTIME_DIR are not set
+        #   * /run/mpd does not expose a socket
+        with mock.patch('os.path.exists', return_value=False):
+            os.environ.pop('MPD_HOST', None)
+            os.environ.pop('MPD_PORT', None)
+            client = musicpd.MPDClient()
+            self.assertEqual(client.host, 'localhost')
+            self.assertEqual(client.port, '6600')
 
+            os.environ.pop('MPD_HOST', None)
+            os.environ['MPD_PORT'] = '6666'
+            client = musicpd.MPDClient()
+            self.assertEqual(client.pwd, None)
+            self.assertEqual(client.host, 'localhost')
+            self.assertEqual(client.port, '6666')
+
+        # Test password extraction
         os.environ['MPD_HOST'] = 'pa55w04d@example.org'
         client = musicpd.MPDClient()
         self.assertEqual(client.pwd, 'pa55w04d')
         self.assertEqual(client.host, 'example.org')
-        self.assertEqual(client.port, '6600')
 
-        os.environ.pop('MPD_HOST', None)
-        os.environ['MPD_PORT'] = '6666'
+        # Test unix socket extraction
+        os.environ['MPD_HOST'] = 'pa55w04d@/unix/sock'
         client = musicpd.MPDClient()
-        self.assertEqual(client.pwd, None)
-        self.assertEqual(client.host, 'localhost')
-        self.assertEqual(client.port, '6666')
+        self.assertEqual(client.host, '/unix/sock')
 
         # Test unix socket fallback
         os.environ.pop('MPD_HOST', None)
@@ -62,6 +73,9 @@ class testEnvVar(unittest.TestCase):
         with mock.patch('os.path.exists', return_value=True):
             client = musicpd.MPDClient()
             self.assertEqual(client.host, '/run/mpd/socket')
+            os.environ['XDG_RUNTIME_DIR'] = '/run/user/1000'
+            client = musicpd.MPDClient()
+            self.assertEqual(client.host, '/run/user/1000/mpd/socket')
 
         os.environ.pop('MPD_HOST', None)
         os.environ.pop('MPD_PORT', None)
@@ -70,6 +84,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 +251,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 +267,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)