projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10467: Merge branch 'master' into 10467-client-disconnect
[arvados.git]
/
sdk
/
python
/
tests
/
test_collections.py
diff --git
a/sdk/python/tests/test_collections.py
b/sdk/python/tests/test_collections.py
index 0767f2a3f60dfd1399f8bc75857e47fc4f480c34..0e3d5e13f135c84f2fde2f741bd554b0ccdf3a85 100644
(file)
--- a/
sdk/python/tests/test_collections.py
+++ b/
sdk/python/tests/test_collections.py
@@
-861,6
+861,8
@@
class NewCollectionTestCase(unittest.TestCase, CollectionTestMixin):
c.find("/.")
with self.assertRaises(arvados.errors.ArgumentError):
c.find("")
c.find("/.")
with self.assertRaises(arvados.errors.ArgumentError):
c.find("")
+ self.assertIs(c.find("./nonexistant.txt"), None)
+ self.assertIs(c.find("./nonexistantsubdir/nonexistant.txt"), None)
def test_remove_in_subdir(self):
c = Collection('. 781e5e245d69b566979b86e28d23f2c7+10 0:10:count1.txt\n./foo 781e5e245d69b566979b86e28d23f2c7+10 0:10:count2.txt\n')
def test_remove_in_subdir(self):
c = Collection('. 781e5e245d69b566979b86e28d23f2c7+10 0:10:count1.txt\n./foo 781e5e245d69b566979b86e28d23f2c7+10 0:10:count2.txt\n')
@@
-1110,16
+1112,19
@@
class NewCollectionTestCaseWithServers(run_test_server.TestCaseWithServers):
def test_only_small_blocks_are_packed_together(self):
c = Collection()
# Write a couple of small files,
def test_only_small_blocks_are_packed_together(self):
c = Collection()
# Write a couple of small files,
- with c.open("count.txt", "w") as f:
- f.write("0123456789")
- with c.open("foo.txt", "w") as foo:
- foo.write("foo")
+ f = c.open("count.txt", "w")
+ f.write("0123456789")
+ f.close(flush=False)
+ foo = c.open("foo.txt", "w")
+ foo.write("foo")
+ foo.close(flush=False)
# Then, write a big file, it shouldn't be packed with the ones above
# Then, write a big file, it shouldn't be packed with the ones above
- with c.open("bigfile.txt", "w") as big:
- big.write("x" * 1024 * 1024 * 33) # 33 MB > KEEP_BLOCK_SIZE/2
+ big = c.open("bigfile.txt", "w")
+ big.write("x" * 1024 * 1024 * 33) # 33 MB > KEEP_BLOCK_SIZE/2
+ big.close(flush=False)
self.assertEqual(
c.manifest_text("."),
self.assertEqual(
c.manifest_text("."),
- '. 2d303c138c118af809f39319e5d507e9+34603008
e62e558e58131771aae2fd0175cdbf2a+13 0:34603008:bigfile.txt 34603011:10:count.txt 3460300
8:3:foo.txt\n')
+ '. 2d303c138c118af809f39319e5d507e9+34603008
a8430a058b8fbf408e1931b794dbd6fb+13 0:34603008:bigfile.txt 34603008:10:count.txt 3460301
8:3:foo.txt\n')
class CollectionCreateUpdateTest(run_test_server.TestCaseWithServers):
class CollectionCreateUpdateTest(run_test_server.TestCaseWithServers):