X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f81a5a1adb403f9c81159239e92880843dca3c93..97be38eaf9715da04930018db29d12894813d551:/sdk/python/tests/test_stream.py diff --git a/sdk/python/tests/test_stream.py b/sdk/python/tests/test_stream.py index 6c3bd61414..dc84a037f8 100644 --- a/sdk/python/tests/test_stream.py +++ b/sdk/python/tests/test_stream.py @@ -1,5 +1,9 @@ -#!/usr/bin/env python +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 +from __future__ import absolute_import +from builtins import object import bz2 import gzip import io @@ -12,8 +16,8 @@ import arvados from arvados import StreamReader, StreamFileReader from arvados._ranges import Range -import arvados_testutil as tutil -import run_test_server +from . import arvados_testutil as tutil +from . import run_test_server class StreamFileReaderTestCase(unittest.TestCase): def make_count_reader(self): @@ -24,28 +28,28 @@ class StreamFileReaderTestCase(unittest.TestCase): def test_read_block_crossing_behavior(self): # read() calls will be aligned on block boundaries - see #3663. sfile = self.make_count_reader() - self.assertEqual('123', sfile.read(10)) + self.assertEqual(b'123', sfile.read(10)) def test_small_read(self): sfile = self.make_count_reader() - self.assertEqual('12', sfile.read(2)) + self.assertEqual(b'12', sfile.read(2)) def test_successive_reads(self): sfile = self.make_count_reader() - for expect in ['123', '456', '789', '']: + for expect in [b'123', b'456', b'789', b'']: self.assertEqual(expect, sfile.read(10)) def test_readfrom_spans_blocks(self): sfile = self.make_count_reader() - self.assertEqual('6789', sfile.readfrom(5, 12)) + self.assertEqual(b'6789', sfile.readfrom(5, 12)) def test_small_readfrom_spanning_blocks(self): sfile = self.make_count_reader() - self.assertEqual('2345', sfile.readfrom(1, 4)) + self.assertEqual(b'2345', sfile.readfrom(1, 4)) def test_readall(self): sfile = self.make_count_reader() - self.assertEqual('123456789', ''.join(sfile.readall())) + self.assertEqual(b'123456789', b''.join(sfile.readall())) def test_one_arg_seek(self): self.test_absolute_seek([]) @@ -53,30 +57,33 @@ class StreamFileReaderTestCase(unittest.TestCase): def test_absolute_seek(self, args=[os.SEEK_SET]): sfile = self.make_count_reader() sfile.seek(6, *args) - self.assertEqual('78', sfile.read(2)) + self.assertEqual(b'78', sfile.read(2)) sfile.seek(4, *args) - self.assertEqual('56', sfile.read(2)) + self.assertEqual(b'56', sfile.read(2)) def test_relative_seek(self, args=[os.SEEK_CUR]): sfile = self.make_count_reader() - self.assertEqual('12', sfile.read(2)) + self.assertEqual(b'12', sfile.read(2)) sfile.seek(2, *args) - self.assertEqual('56', sfile.read(2)) + self.assertEqual(b'56', sfile.read(2)) def test_end_seek(self): sfile = self.make_count_reader() sfile.seek(-6, os.SEEK_END) - self.assertEqual('45', sfile.read(2)) + self.assertEqual(b'45', sfile.read(2)) def test_seek_min_zero(self): sfile = self.make_count_reader() - sfile.seek(-2, os.SEEK_SET) + self.assertEqual(0, sfile.tell()) + with self.assertRaises(IOError): + sfile.seek(-2, os.SEEK_SET) self.assertEqual(0, sfile.tell()) def test_seek_max_size(self): sfile = self.make_count_reader() sfile.seek(2, os.SEEK_END) - self.assertEqual(9, sfile.tell()) + # POSIX permits seeking past end of file. + self.assertEqual(11, sfile.tell()) def test_size(self): self.assertEqual(9, self.make_count_reader().size()) @@ -99,7 +106,7 @@ class StreamFileReaderTestCase(unittest.TestCase): def test_context(self): with self.make_count_reader() as sfile: self.assertFalse(sfile.closed, "reader is closed inside context") - self.assertEqual('12', sfile.read(2)) + self.assertEqual(b'12', sfile.read(2)) self.assertTrue(sfile.closed, "reader is open after context") def make_newlines_reader(self): @@ -161,12 +168,12 @@ class StreamFileReaderTestCase(unittest.TestCase): self.check_decompressed_name('test.log.bz2', 'test.log') def check_decompression(self, compress_ext, compress_func): - test_text = 'decompression\ntest\n' + test_text = b'decompression\ntest\n' test_data = compress_func(test_text) stream = tutil.MockStreamReader('.', test_data) reader = StreamFileReader(stream, [Range(0, 0, len(test_data))], 'test.' + compress_ext) - self.assertEqual(test_text, ''.join(reader.readall_decompressed())) + self.assertEqual(test_text, b''.join(reader.readall_decompressed())) @staticmethod def gzip_compress(data): @@ -184,6 +191,19 @@ class StreamFileReaderTestCase(unittest.TestCase): def test_bz2_decompression(self): self.check_decompression('bz2', bz2.compress) + def test_readline_then_readlines(self): + reader = self.make_newlines_reader() + data = reader.readline() + self.assertEqual('one\n', data) + data = reader.readlines() + self.assertEqual(['two\n', '\n', 'three\n', 'four\n', '\n'], data) + + def test_readline_then_readall(self): + reader = self.make_newlines_reader() + data = reader.readline() + self.assertEqual('one\n', data) + self.assertEqual(b''.join([b'two\n', b'\n', b'three\n', b'four\n', b'\n']), b''.join(reader.readall())) + class StreamRetryTestMixin(object): # Define reader_for(coll_name, **kwargs) @@ -201,7 +221,7 @@ class StreamRetryTestMixin(object): def test_success_without_retries(self): with tutil.mock_keep_responses('bar', 200): reader = self.reader_for('bar_file') - self.assertEqual('bar', self.read_for_test(reader, 3)) + self.assertEqual(b'bar', self.read_for_test(reader, 3)) @tutil.skip_sleep def test_read_no_default_retry(self): @@ -214,13 +234,13 @@ class StreamRetryTestMixin(object): def test_read_with_instance_retries(self): with tutil.mock_keep_responses('foo', 500, 200): reader = self.reader_for('foo_file', num_retries=3) - self.assertEqual('foo', self.read_for_test(reader, 3)) + self.assertEqual(b'foo', self.read_for_test(reader, 3)) @tutil.skip_sleep def test_read_with_method_retries(self): with tutil.mock_keep_responses('foo', 500, 200): reader = self.reader_for('foo_file') - self.assertEqual('foo', + self.assertEqual(b'foo', self.read_for_test(reader, 3, num_retries=3)) @tutil.skip_sleep @@ -276,17 +296,17 @@ class StreamFileReadFromTestCase(StreamFileReadTestCase): class StreamFileReadAllTestCase(StreamFileReadTestCase): def read_for_test(self, reader, byte_count, **kwargs): - return ''.join(reader.readall(**kwargs)) + return b''.join(reader.readall(**kwargs)) class StreamFileReadAllDecompressedTestCase(StreamFileReadTestCase): def read_for_test(self, reader, byte_count, **kwargs): - return ''.join(reader.readall_decompressed(**kwargs)) + return b''.join(reader.readall_decompressed(**kwargs)) class StreamFileReadlinesTestCase(StreamFileReadTestCase): def read_for_test(self, reader, byte_count, **kwargs): - return ''.join(reader.readlines(**kwargs)) + return ''.join(reader.readlines(**kwargs)).encode() if __name__ == '__main__': unittest.main()