Fix unit tests.

.travis.yml

@@ -7,4 +7,4 @@ python:
 script: python setup.py test
 install:
  - sudo apt-get install rtmpdump
- - sudo pip install requests sh argparse
+ - sudo pip install requests==0.14.1 sh argparse

tests/test_log.py

@@ -1,7 +1,15 @@
 import unittest
 
 from livestreamer.logger import Logger
-from io import StringIO
+from livestreamer.compat import is_py2
+
+# Docs says StringIO is suppose to take non-unicode strings
+# but it doesn't, so let's use BytesIO instead there...
+
+if is_py2:
+    from io import BytesIO as StringIO
+else:
+    from io import StringIO
 
 class TestSession(unittest.TestCase):
     def setUp(self):

tests/test_session.py

@@ -31,8 +31,8 @@ def test_builtin_plugins(self):
     def test_resolve_url(self):
         plugins = self.session.get_plugins()
         channel = self.session.resolve_url("http://test.se/channel")
-        self.assertIsInstance(channel, Plugin)
-        self.assertIsInstance(channel, plugins["testplugin"])
+        self.assertTrue(isinstance(channel, Plugin))
+        self.assertTrue(isinstance(channel, plugins["testplugin"]))
 
     def test_options(self):
         self.session.set_option("test_option", "option")
@@ -50,11 +50,11 @@ def test_plugin(self):
         streams = channel.get_streams()
 
         self.assertTrue("best" in streams)
-        self.assertIs(streams["best"], streams["1080p"])
-        self.assertIsInstance(streams["rtmp"], RTMPStream)
-        self.assertIsInstance(streams["http"], HTTPStream)
-        self.assertIsInstance(streams["hls"], HLSStream)
-        self.assertIsInstance(streams["akamaihd"], AkamaiHDStream)
+        self.assertTrue(streams["best"] is streams["1080p"])
+        self.assertTrue(isinstance(streams["rtmp"], RTMPStream))
+        self.assertTrue(isinstance(streams["http"], HTTPStream))
+        self.assertTrue(isinstance(streams["hls"], HLSStream))
+        self.assertTrue(isinstance(streams["akamaihd"], AkamaiHDStream))
 
 if __name__ == "__main__":
     unittest.main()