diff options
author | Scott Maxwell <scott@codecobblers.com> | 2013-11-02 14:56:43 -0700 |
---|---|---|
committer | Scott Maxwell <scott@codecobblers.com> | 2013-11-02 14:56:43 -0700 |
commit | 45e65b6e1eb47944a26e4349d41998844c155df5 (patch) | |
tree | 3bc7cb1f1fcfd1d7230f71c9e083c30485f1f951 /tests/test_file.py | |
parent | 7decda3297089b2b2e73bb9cd7e577f9b2cb2789 (diff) | |
download | paramiko-45e65b6e1eb47944a26e4349d41998844c155df5.tar.gz |
Make sftp.open handle binary and text, more type conversion
Diffstat (limited to 'tests/test_file.py')
-rwxr-xr-x | tests/test_file.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/test_file.py b/tests/test_file.py index 6cb35070..0430040c 100755 --- a/tests/test_file.py +++ b/tests/test_file.py @@ -22,6 +22,7 @@ Some unit tests for the BufferedFile abstraction. import unittest from paramiko.file import BufferedFile +from paramiko.common import * class LoopbackFile (BufferedFile): @@ -31,7 +32,7 @@ class LoopbackFile (BufferedFile): def __init__(self, mode='r', bufsize=-1): BufferedFile.__init__(self) self._set_mode(mode, bufsize) - self.buffer = '' + self.buffer = bytes() def _read(self, size): if len(self.buffer) == 0: @@ -83,9 +84,9 @@ class BufferedFileTest (unittest.TestCase): self.assert_(False, 'no exception on readline of closed file') except IOError: pass - self.assert_('\n' in f.newlines) - self.assert_('\r\n' in f.newlines) - self.assert_('\r' not in f.newlines) + self.assert_(linefeed_byte in f.newlines) + self.assert_(crlf in f.newlines) + self.assert_(cr_byte not in f.newlines) def test_3_lf(self): """ @@ -97,7 +98,7 @@ class BufferedFileTest (unittest.TestCase): f.write('\nSecond.\r\n') self.assertEqual(f.readline(), 'Second.\n') f.close() - self.assertEqual(f.newlines, '\r\n') + self.assertEqual(f.newlines, crlf) def test_4_write(self): """ |