11167: Merge branch 'master' into 11167-wb-remove-arvget

[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 297fbfc92920647fb2d8270224c572c9f0321703..faad29872de541621ae258ac5dfb635c35ca9bf6 100644 (file)
--- a/sdk/python/tests/test_arvfile.py
+++ b/sdk/python/tests/test_arvfile.py
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from __future__ import absolute_import
 from builtins import hex
 from builtins import str
@@ -216,14 +220,21 @@ class ArvadosFileWriterTestCase(unittest.TestCase):
         c = Collection('. 781e5e245d69b566979b86e28d23f2c7+10 0:10:count.txt\n', keep_client=keep)
         writer = c.open("count.txt", "ab+")
         self.assertEqual(writer.read(20), b"0123456789")
-        writer.seek(0, os.SEEK_SET)
 
+        writer.seek(0, os.SEEK_SET)
         writer.write("hello")
-        self.assertEqual(writer.read(20), b"0123456789hello")
+        self.assertEqual(writer.read(), b"")
+        writer.seek(-5, os.SEEK_CUR)
+        self.assertEqual(writer.read(3), b"hel")
+        self.assertEqual(writer.read(), b"lo")
         writer.seek(0, os.SEEK_SET)
+        self.assertEqual(writer.read(), b"0123456789hello")
 
+        writer.seek(0)
         writer.write("world")
-        self.assertEqual(writer.read(20), b"0123456789helloworld")
+        self.assertEqual(writer.read(), b"")
+        writer.seek(0)
+        self.assertEqual(writer.read(), b"0123456789helloworld")
 
         self.assertEqual(". 781e5e245d69b566979b86e28d23f2c7+10 fc5e038d38a57032085441e7fe7010b0+10 0:20:count.txt\n", c.portable_manifest_text())
 
@@ -825,7 +836,7 @@ class BlockManagerTest(unittest.TestCase):
         mockkeep = mock.MagicMock()
         with arvados.arvfile._BlockManager(mockkeep) as blockmanager:
             bufferblock = blockmanager.alloc_bufferblock()
-            bufferblock.owner = mock.MagicMock()
+            bufferblock.owner = mock.MagicMock(spec=arvados.arvfile.ArvadosFile)
             def flush(sync=None):
                 blockmanager.commit_bufferblock(bufferblock, sync)
             bufferblock.owner.flush.side_effect = flush
@@ -856,7 +867,7 @@ class BlockManagerTest(unittest.TestCase):
         mockkeep.put.side_effect = arvados.errors.KeepWriteError("fail")
         with arvados.arvfile._BlockManager(mockkeep) as blockmanager:
             bufferblock = blockmanager.alloc_bufferblock()
-            bufferblock.owner = mock.MagicMock()
+            bufferblock.owner = mock.MagicMock(spec=arvados.arvfile.ArvadosFile)
             def flush(sync=None):
                 blockmanager.commit_bufferblock(bufferblock, sync)
             bufferblock.owner.flush.side_effect = flush