Merge branch '2.4' into 2.5

2 files changed, 48 insertions, 0 deletions

diff --git a/setup.cfg b/setup.cfg
index 9dc712a7..1b589871 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,3 +22,9 @@ max-line-length = 79
 addopts = -p no:relaxed
 # Loop on failure
 looponfailroots = tests paramiko
+# Ignore some warnings we cannot easily handle.
+# (NOTE: the CryptographyDeprecationWarning one should ONLY be in our 2.4
+# branch)
+filterwarnings =
+    ignore::DeprecationWarning:pkg_resources
+    ignore::cryptography.utils.CryptographyDeprecationWarning
diff --git a/tests/test_channelfile.py b/tests/test_channelfile.py
new file mode 100644
index 00000000..f8cfe473
--- /dev/null
+++ b/tests/test_channelfile.py
@@ -0,0 +1,42 @@
+from mock import patch, MagicMock
+
+from paramiko import Channel, ChannelFile
+
+
+class TestChannelFile(object):
+    @patch("paramiko.channel.ChannelFile._set_mode")
+    def test_defaults_to_unbuffered_reading(self, setmode):
+        cf = ChannelFile(Channel(None))
+        setmode.assert_called_once_with("r", -1)
+
+    @patch("paramiko.channel.ChannelFile._set_mode")
+    def test_can_override_mode_and_bufsize(self, setmode):
+        cf = ChannelFile(Channel(None), mode="w", bufsize=25)
+        setmode.assert_called_once_with("w", 25)
+
+    def test_read_recvs_from_channel(self):
+        chan = MagicMock()
+        cf = ChannelFile(chan)
+        cf.read(100)
+        chan.recv.assert_called_once_with(100)
+
+    def test_write_calls_channel_sendall(self):
+        chan = MagicMock()
+        cf = ChannelFile(chan, mode="w")
+        cf.write("ohai")
+        chan.sendall.assert_called_once_with(b"ohai")
+
+
+def TestChannelStderrFile(object):
+    def test_read_calls_channel_recv_stderr(self):
+        chan = MagicMock()
+        cf = ChannelStderrFile(chan)
+        cf.read(100)
+        chan.recv_stderr.assert_called_once_with(100)
+
+    def test_write_calls_channel_sendall(self):
+        chan = MagicMock()
+        cf = ChannelStderrFile(chan, mode="w")
+        cf.write("ohai")
+        chan.sendall_stderr.assert_called_once_with(b"ohai")
+