Add missing re import to PySDK arvfile module.
[arvados.git] / sdk / python / tests / test_stream.py
index 5f0264c161e7712cf7fce4799647e6c60c64eb76..15257fe31270e8d3614ba44e02637c3fbf7c3691 100644 (file)
@@ -9,7 +9,8 @@ import unittest
 import hashlib
 
 import arvados
-from arvados import StreamReader, StreamFileReader, StreamWriter, StreamFileWriter
+from arvados import StreamReader, StreamFileReader
+from arvados._ranges import Range
 
 import arvados_testutil as tutil
 import run_test_server
@@ -17,7 +18,7 @@ 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):
@@ -103,7 +104,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'],
@@ -141,15 +142,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()))
 
@@ -184,48 +199,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):
+            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):
+            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):
+            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):
+            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):
+            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):
+            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):
+            reader = self.reader_for('user_agreement', num_retries=10)
             with self.assertRaises(arvados.errors.KeepReadError):
                 self.read_for_test(reader, 10, num_retries=1)
 
@@ -273,150 +288,5 @@ class StreamFileReadlinesTestCase(StreamFileReadTestCase):
     def read_for_test(self, reader, byte_count, **kwargs):
         return ''.join(reader.readlines(**kwargs))
 
-class StreamWriterTestCase(unittest.TestCase):
-    class MockKeep(object):
-        def __init__(self, blocks):
-            self.blocks = blocks
-        def get(self, locator, num_retries=0):
-            return self.blocks[locator]
-        def put(self, data):
-            pdh = "%s+%i" % (hashlib.md5(data).hexdigest(), len(data))
-            self.blocks[pdh] = str(data)
-            return pdh
-
-    def test_init(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:10:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        self.assertEqual("01234", stream.readfrom(0, 5))
-
-    def test_append(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:10:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        self.assertEqual("56789", stream.readfrom(5, 8))
-        stream.append("foo")
-        self.assertEqual("56789foo", stream.readfrom(5, 8))
-
-
-class StreamFileWriterTestCase(unittest.TestCase):
-    def test_truncate(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:10:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        writer = stream.files()["count.txt"]
-        self.assertEqual("56789", writer.readfrom(5, 8))
-        writer.truncate(8)
-        self.assertEqual("567", writer.readfrom(5, 8))
-
-    def test_append(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:10:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        writer = stream.files()["count.txt"]
-        self.assertEqual("56789", writer.readfrom(5, 8))
-        writer.seek(10)
-        writer.write("foo")
-        self.assertEqual(writer.size(), 13)
-        self.assertEqual("56789foo", writer.readfrom(5, 8))
-
-    def test_write0(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:10:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        writer = stream.files()["count.txt"]
-        self.assertEqual("0123456789", writer.readfrom(0, 13))
-        writer.seek(0)
-        writer.write("foo")
-        self.assertEqual(writer.size(), 10)
-        self.assertEqual("foo3456789", writer.readfrom(0, 13))
-        self.assertEqual(". 781e5e245d69b566979b86e28d23f2c7+10 bufferblock0 10:3:count.txt 3:7:count.txt\n", stream.manifest_text())
-
-    def test_write1(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:10:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        writer = stream.files()["count.txt"]
-        self.assertEqual("0123456789", writer.readfrom(0, 13))
-        writer.seek(3)
-        writer.write("foo")
-        self.assertEqual(writer.size(), 10)
-        self.assertEqual("012foo6789", writer.readfrom(0, 13))
-        self.assertEqual(". 781e5e245d69b566979b86e28d23f2c7+10 bufferblock0 0:3:count.txt 10:3:count.txt 6:4:count.txt\n", stream.manifest_text())
-
-    def test_write2(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:10:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        writer = stream.files()["count.txt"]
-        self.assertEqual("0123456789", writer.readfrom(0, 13))
-        writer.seek(7)
-        writer.write("foo")
-        self.assertEqual(writer.size(), 10)
-        self.assertEqual("0123456foo", writer.readfrom(0, 13))
-        self.assertEqual(". 781e5e245d69b566979b86e28d23f2c7+10 bufferblock0 0:7:count.txt 10:3:count.txt\n", stream.manifest_text())
-
-    def test_write3(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:10:count.txt', '0:10:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        writer = stream.files()["count.txt"]
-        self.assertEqual("012345678901234", writer.readfrom(0, 15))
-        writer.seek(7)
-        writer.write("foobar")
-        self.assertEqual(writer.size(), 20)
-        self.assertEqual("0123456foobar34", writer.readfrom(0, 15))
-        self.assertEqual(". 781e5e245d69b566979b86e28d23f2c7+10 bufferblock0 0:7:count.txt 10:6:count.txt 3:7:count.txt\n", stream.manifest_text())
-
-    def test_write4(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:4:count.txt', '0:4:count.txt', '0:4:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        writer = stream.files()["count.txt"]
-        self.assertEqual("012301230123", writer.readfrom(0, 15))
-        writer.seek(2)
-        writer.write("abcdefg")
-        self.assertEqual(writer.size(), 12)
-        self.assertEqual("01abcdefg123", writer.readfrom(0, 15))
-        self.assertEqual(". 781e5e245d69b566979b86e28d23f2c7+10 bufferblock0 0:2:count.txt 10:7:count.txt 1:3:count.txt\n", stream.manifest_text())
-
-    def test_write_large(self):
-        stream = StreamWriter(['.', arvados.config.EMPTY_BLOCK_LOCATOR, '0:0:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({}))
-        writer = stream.files()["count.txt"]
-        text = ''.join(["0123456789" for a in xrange(0, 100)])
-        for b in xrange(0, 100000):
-            writer.write(text)
-        self.assertEqual(writer.size(), 100000000)
-        stream.commit()
-        self.assertEqual(". a5de24f4417cfba9d5825eadc2f4ca49+67108000 598cc1a4ccaef8ab6e4724d87e675d78+32892000 0:100000000:count.txt\n", stream.manifest_text())
-
-    def test_write_rewrite0(self):
-        stream = StreamWriter(['.', arvados.config.EMPTY_BLOCK_LOCATOR, '0:0:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({}))
-        writer = stream.files()["count.txt"]
-        for b in xrange(0, 10):
-            writer.seek(0, os.SEEK_SET)
-            writer.write("0123456789")
-        stream.commit()
-        self.assertEqual(writer.size(), 10)
-        self.assertEqual("0123456789", writer.readfrom(0, 20))
-        self.assertEqual(". 781e5e245d69b566979b86e28d23f2c7+10 0:10:count.txt\n", stream.manifest_text())
-
-    def test_write_rewrite1(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:10:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        writer = stream.files()["count.txt"]
-        for b in xrange(0, 10):
-            writer.seek(10, os.SEEK_SET)
-            writer.write("abcdefghij")
-        stream.commit()
-        self.assertEqual(writer.size(), 20)
-        self.assertEqual("0123456789abcdefghij", writer.readfrom(0, 20))
-        self.assertEqual(". 781e5e245d69b566979b86e28d23f2c7+10 a925576942e94b2ef57a066101b48876+10 0:10:count.txt 10:10:count.txt\n", stream.manifest_text())
-
-    def test_write_rewrite2(self):
-        stream = StreamWriter(['.', '781e5e245d69b566979b86e28d23f2c7+10', '0:10:count.txt'],
-                              keep=StreamWriterTestCase.MockKeep({"781e5e245d69b566979b86e28d23f2c7+10": "0123456789"}))
-        writer = stream.files()["count.txt"]
-        for b in xrange(0, 10):
-            writer.seek(5, os.SEEK_SET)
-            writer.write("abcdefghij")
-        stream.commit()
-        self.assertEqual(writer.size(), 15)
-        self.assertEqual("01234abcdefghij", writer.readfrom(0, 20))
-        self.assertEqual(". 781e5e245d69b566979b86e28d23f2c7+10 a925576942e94b2ef57a066101b48876+10 0:5:count.txt 10:10:count.txt\n", stream.manifest_text())
-
 if __name__ == '__main__':
     unittest.main()