projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Declare serialize / accept json fields, start working on states
[arvados.git]
/
services
/
fuse
/
tests
/
test_mount.py
diff --git
a/services/fuse/tests/test_mount.py
b/services/fuse/tests/test_mount.py
index b91b1410f281f0dd24b2acc584890afa8bd5dd49..05c8685607f14a0e7938379ab8f4fab7f3001e63 100644
(file)
--- a/
services/fuse/tests/test_mount.py
+++ b/
services/fuse/tests/test_mount.py
@@
-427,12
+427,16
@@
class FuseWriteFileTest(MountTestBase):
self.assertNotIn("file1.txt", collection)
self.assertNotIn("file1.txt", collection)
+ self.assertEqual(0, self.operations.write_counter.get())
self.pool.apply(fuseWriteFileTestHelperWriteFile, (self.mounttmp,))
self.pool.apply(fuseWriteFileTestHelperWriteFile, (self.mounttmp,))
+ self.assertEqual(12, self.operations.write_counter.get())
with collection.open("file1.txt") as f:
self.assertEqual(f.read(), "Hello world!")
with collection.open("file1.txt") as f:
self.assertEqual(f.read(), "Hello world!")
+ self.assertEqual(0, self.operations.read_counter.get())
self.pool.apply(fuseWriteFileTestHelperReadFile, (self.mounttmp,))
self.pool.apply(fuseWriteFileTestHelperReadFile, (self.mounttmp,))
+ self.assertEqual(12, self.operations.read_counter.get())
collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
self.assertRegexpMatches(collection2["manifest_text"],
collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
self.assertRegexpMatches(collection2["manifest_text"],
@@
-699,7
+703,7
@@
class FuseUpdateFromEventTest(MountTestBase):
with llfuse.lock:
m.new_collection(collection.api_response(), collection)
with llfuse.lock:
m.new_collection(collection.api_response(), collection)
- self.operations.listen_for_events(
self.api
)
+ self.operations.listen_for_events()
d1 = llfuse.listdir(os.path.join(self.mounttmp))
self.assertEqual([], sorted(d1))
d1 = llfuse.listdir(os.path.join(self.mounttmp))
self.assertEqual([], sorted(d1))
@@
-1076,8
+1080,11
@@
class FuseMagicTestPDHOnly(MountTestBase):
created = self.api.collections().create(body={"manifest_text":self.test_manifest}).execute()
self.testcollectionuuid = str(created['uuid'])
created = self.api.collections().create(body={"manifest_text":self.test_manifest}).execute()
self.testcollectionuuid = str(created['uuid'])
- def runTest(self):
- self.make_mount(fuse.MagicDirectory, pdh_only=True)
+ def verify_pdh_only(self, pdh_only=False, skip_pdh_only=False):
+ if skip_pdh_only is True:
+ self.make_mount(fuse.MagicDirectory) # in this case, the default by_id applies
+ else:
+ self.make_mount(fuse.MagicDirectory, pdh_only=pdh_only)
mount_ls = llfuse.listdir(self.mounttmp)
self.assertIn('README', mount_ls)
mount_ls = llfuse.listdir(self.mounttmp)
self.assertIn('README', mount_ls)
@@
-1086,7
+1093,7
@@
class FuseMagicTestPDHOnly(MountTestBase):
for fn in mount_ls),
"new FUSE MagicDirectory lists Collection")
for fn in mount_ls),
"new FUSE MagicDirectory lists Collection")
- # look up using pdh should succeed
+ # look up using pdh should succeed
in all cases
self.assertDirContents(self.testcollection, ['thing1.txt'])
self.assertDirContents(os.path.join('by_id', self.testcollection),
['thing1.txt'])
self.assertDirContents(self.testcollection, ['thing1.txt'])
self.assertDirContents(os.path.join('by_id', self.testcollection),
['thing1.txt'])
@@
-1103,7
+1110,20
@@
class FuseMagicTestPDHOnly(MountTestBase):
with open(os.path.join(self.mounttmp, k)) as f:
self.assertEqual(v, f.read())
with open(os.path.join(self.mounttmp, k)) as f:
self.assertEqual(v, f.read())
- # look up using uuid should fail
- with self.assertRaises(OSError):
+ # look up using uuid should fail when pdh_only is set
+ if pdh_only is True:
+ with self.assertRaises(OSError):
+ self.assertDirContents(os.path.join('by_id', self.testcollectionuuid),
+ ['thing1.txt'])
+ else:
self.assertDirContents(os.path.join('by_id', self.testcollectionuuid),
['thing1.txt'])
self.assertDirContents(os.path.join('by_id', self.testcollectionuuid),
['thing1.txt'])
+
+ def test_with_pdh_only_true(self):
+ self.verify_pdh_only(pdh_only=True)
+
+ def test_with_pdh_only_false(self):
+ self.verify_pdh_only(pdh_only=False)
+
+ def test_with_default_by_id(self):
+ self.verify_pdh_only(skip_pdh_only=True)