Merge branch '5416-browse-repo-tree' refs #5416

[arvados.git] / sdk / python / tests / test_stream.py

diff --git a/sdk/python/tests/test_stream.py b/sdk/python/tests/test_stream.py
index 11ee69493c771d84012a2348b8ffb1eab7b483e5..acb9929cae3ce90f9207d4e0754bd66cc57f5f2c 100644 (file)
--- a/sdk/python/tests/test_stream.py
+++ b/sdk/python/tests/test_stream.py
@@ -9,7 +9,8 @@ import unittest
 import hashlib
 
 import arvados
-from arvados import StreamReader, StreamFileReader, Range
+from arvados import StreamReader, StreamFileReader
+from arvados._ranges import Range
 
 import arvados_testutil as tutil
 import run_test_server
@@ -47,7 +48,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()
@@ -145,6 +146,20 @@ class StreamFileReaderTestCase(unittest.TestCase):
         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)