Merge branch '5724-blob-signature-ttl' closes #5724

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

diff --git a/sdk/python/tests/test_arvfile.py b/sdk/python/tests/test_arvfile.py
index 4e7dd75ccaba78b3769be08bae734f9e6c23e710..1701aa43caae5baaa3f25522230c5b9c4ac46994 100644 (file)
--- a/sdk/python/tests/test_arvfile.py
+++ b/sdk/python/tests/test_arvfile.py
@@ -440,24 +440,19 @@ class ArvadosFileReaderTestCase(StreamFileReaderTestCase):
         af = ArvadosFile(ArvadosFileReaderTestCase.MockParent(blocks, nocache), stream=stream, segments=[Range(1, 0, 3), Range(6, 3, 3), Range(11, 6, 3)])
         return ArvadosFileReader(af, "count.txt")
 
-    def test_read_crosses_blocks(self):
+    def test_read_block_crossing_behavior(self):
         # read() needs to return all the data requested if possible, even if it
         # crosses uncached blocks: https://arvados.org/issues/5856
         sfile = self.make_count_reader(nocache=True)
         self.assertEqual('12345678', sfile.read(8))
 
-    def test_read_returns_first_block(self):
-        # Override StreamFileReaderTestCase.test_read_returns_first_block
-        sfile = self.make_count_reader(nocache=True)
-        self.assertEqual('123', sfile.arvadosfile.readfrom(0, 10, 0))
-
     def test_successive_reads(self):
         # Override StreamFileReaderTestCase.test_successive_reads
         sfile = self.make_count_reader(nocache=True)
-        self.assertEqual('123', sfile.arvadosfile.readfrom(0, 10, 0))
-        self.assertEqual('456', sfile.arvadosfile.readfrom(3, 10, 0))
-        self.assertEqual('789', sfile.arvadosfile.readfrom(6, 10, 0))
-        self.assertEqual('', sfile.arvadosfile.readfrom(9, 10, 0))
+        self.assertEqual('1234', sfile.read(4))
+        self.assertEqual('5678', sfile.read(4))
+        self.assertEqual('9', sfile.read(4))
+        self.assertEqual('', sfile.read(4))
 
     def test_tell_after_block_read(self):
         # Override StreamFileReaderTestCase.test_tell_after_block_read