X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e158f485053be1e840073b321033d60d686a55a8..e61df48303291900581ef4a64dcf97864598c5f4:/sdk/python/tests/test_stream.py diff --git a/sdk/python/tests/test_stream.py b/sdk/python/tests/test_stream.py index 08a3d28a5d..7277628122 100644 --- a/sdk/python/tests/test_stream.py +++ b/sdk/python/tests/test_stream.py @@ -1,25 +1,29 @@ #!/usr/bin/env python +from __future__ import absolute_import +from builtins import object import bz2 import gzip import io import mock import os import unittest +import hashlib 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): stream = tutil.MockStreamReader('.', '01234', '34567', '67890') - return StreamFileReader(stream, [[1, 3, 0], [6, 3, 3], [11, 3, 6]], + return StreamFileReader(stream, [Range(1, 0, 3), Range(6, 3, 3), Range(11, 6, 3)], 'count.txt') - def test_read_returns_first_block(self): + 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)) @@ -46,7 +50,7 @@ class StreamFileReaderTestCase(unittest.TestCase): self.assertEqual('123456789', ''.join(sfile.readall())) def test_one_arg_seek(self): - self.test_relative_seek([]) + self.test_absolute_seek([]) def test_absolute_seek(self, args=[os.SEEK_SET]): sfile = self.make_count_reader() @@ -102,7 +106,7 @@ class StreamFileReaderTestCase(unittest.TestCase): def make_newlines_reader(self): stream = tutil.MockStreamReader('.', 'one\ntwo\n\nth', 'ree\nfour\n\n') - return StreamFileReader(stream, [[0, 11, 0], [11, 10, 11]], 'count.txt') + return StreamFileReader(stream, [Range(0, 0, 11), Range(11, 11, 10)], 'count.txt') def check_lines(self, actual): self.assertEqual(['one\n', 'two\n', '\n', 'three\n', 'four\n', '\n'], @@ -140,15 +144,29 @@ class StreamFileReaderTestCase(unittest.TestCase): def test_name_attribute(self): # Test both .name and .name() (for backward compatibility) stream = tutil.MockStreamReader() - sfile = StreamFileReader(stream, [[0, 0, 0]], 'nametest') + sfile = StreamFileReader(stream, [Range(0, 0, 0)], 'nametest') self.assertEqual('nametest', sfile.name) self.assertEqual('nametest', sfile.name()) + def check_decompressed_name(self, filename, expect): + stream = tutil.MockStreamReader('.', '') + reader = StreamFileReader(stream, [Range(0, 0, 0)], filename) + self.assertEqual(expect, reader.decompressed_name()) + + def test_decompressed_name_uncompressed_file(self): + self.check_decompressed_name('test.log', 'test.log') + + def test_decompressed_name_gzip_file(self): + self.check_decompressed_name('test.log.gz', 'test.log') + + def test_decompressed_name_bz2_file(self): + self.check_decompressed_name('test.log.bz2', 'test.log') + def check_decompression(self, compress_ext, compress_func): test_text = 'decompression\ntest\n' test_data = compress_func(test_text) stream = tutil.MockStreamReader('.', test_data) - reader = StreamFileReader(stream, [[0, len(test_data), 0]], + reader = StreamFileReader(stream, [Range(0, 0, len(test_data))], 'test.' + compress_ext) self.assertEqual(test_text, ''.join(reader.readall_decompressed())) @@ -168,6 +186,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(''.join(['two\n', '\n', 'three\n', 'four\n', '\n']), ''.join(reader.readall())) + class StreamRetryTestMixin(object): # Define reader_for(coll_name, **kwargs) @@ -183,48 +214,48 @@ class StreamRetryTestMixin(object): @tutil.skip_sleep def test_success_without_retries(self): - reader = self.reader_for('bar_file') - with tutil.mock_get_responses('bar', 200): + with tutil.mock_keep_responses('bar', 200): + reader = self.reader_for('bar_file') self.assertEqual('bar', self.read_for_test(reader, 3)) @tutil.skip_sleep def test_read_no_default_retry(self): - reader = self.reader_for('user_agreement') - with tutil.mock_get_responses('', 500): + with tutil.mock_keep_responses('', 500): + reader = self.reader_for('user_agreement') with self.assertRaises(arvados.errors.KeepReadError): self.read_for_test(reader, 10) @tutil.skip_sleep def test_read_with_instance_retries(self): - reader = self.reader_for('foo_file', num_retries=3) - with tutil.mock_get_responses('foo', 500, 200): + 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)) @tutil.skip_sleep def test_read_with_method_retries(self): - reader = self.reader_for('foo_file') - with tutil.mock_get_responses('foo', 500, 200): + with tutil.mock_keep_responses('foo', 500, 200): + reader = self.reader_for('foo_file') self.assertEqual('foo', self.read_for_test(reader, 3, num_retries=3)) @tutil.skip_sleep def test_read_instance_retries_exhausted(self): - reader = self.reader_for('bar_file', num_retries=3) - with tutil.mock_get_responses('bar', 500, 500, 500, 500, 200): + with tutil.mock_keep_responses('bar', 500, 500, 500, 500, 200): + reader = self.reader_for('bar_file', num_retries=3) with self.assertRaises(arvados.errors.KeepReadError): self.read_for_test(reader, 3) @tutil.skip_sleep def test_read_method_retries_exhausted(self): - reader = self.reader_for('bar_file') - with tutil.mock_get_responses('bar', 500, 500, 500, 500, 200): + with tutil.mock_keep_responses('bar', 500, 500, 500, 500, 200): + reader = self.reader_for('bar_file') with self.assertRaises(arvados.errors.KeepReadError): self.read_for_test(reader, 3, num_retries=3) @tutil.skip_sleep def test_method_retries_take_precedence(self): - reader = self.reader_for('user_agreement', num_retries=10) - with tutil.mock_get_responses('', 500, 500, 500, 200): + with tutil.mock_keep_responses('', 500, 500, 500, 200): + reader = self.reader_for('user_agreement', num_retries=10) with self.assertRaises(arvados.errors.KeepReadError): self.read_for_test(reader, 10, num_retries=1) @@ -272,6 +303,5 @@ class StreamFileReadlinesTestCase(StreamFileReadTestCase): def read_for_test(self, reader, byte_count, **kwargs): return ''.join(reader.readlines(**kwargs)) - if __name__ == '__main__': unittest.main()