[ARVADOS] updated: b1781295959566608326b69440d8d3ae8e4da4ee
git at public.curoverse.com
git at public.curoverse.com
Tue Nov 10 10:53:19 EST 2015
Summary of changes:
sdk/cli/bin/arv-run-pipeline-instance | 33 ++++---
sdk/go/arvadosclient/arvadosclient.go | 100 +++++++++++++------
sdk/go/arvadosclient/arvadosclient_test.go | 154 +++++++++++++++++++++++++++++
services/fuse/bin/arv-mount | 3 +-
services/fuse/tests/test_mount.py | 47 +++++++++
5 files changed, 294 insertions(+), 43 deletions(-)
via b1781295959566608326b69440d8d3ae8e4da4ee (commit)
via 7fae6271dd3b05db5a7f084cf686f7388e2822db (commit)
via b958fc62a440d30e4f381f88015acfecaa640b71 (commit)
via b5c48c07a2618740eab353150a450fb62bb4ceee (commit)
via 5d74e7583ad4b2d5dfd9eec50d625eded3739d1c (commit)
via c1d63408c611a5ce65dc4de41aeb323c06da2bbc (commit)
via 4c00b4c7c670abe7da5c61e437887a53bbcaadf9 (commit)
via a41db1e1945408d33e0b7905e63d2ae9164b1c49 (commit)
via 4517ed5d2c28870422faf8057d4f6708242cc5a0 (commit)
via 3ded4c192b1fc655d9fffa225f792055f10f78c9 (commit)
via f9577d8ec75fdf861c7dd69ed8cbbc6c3f445669 (commit)
via db68fd029f681f380f218b9b2f4fec3a315f140c (commit)
via 27b9247e0c42700e0c7d94f7721e2164610b1e4c (commit)
via 4288cc1b9f894d3574be1ac04dab01e70e1a4580 (commit)
via ffdfd0ac6e501514c5327c2d6b5f8507bb6353bc (commit)
via 4197567e7b1fe768896ea6af9c4160b43e8521dd (commit)
via 579f6139c9c03fe1b08993746c87aa525ff314e9 (commit)
via cabef98fc6cec3b9616d0c76ba469184b9dce693 (commit)
via c6ec580a9c79d1d21cffa6454d871538ba7c14f0 (commit)
via 4862071616a002ac4873147ea07109629206584a (commit)
from ddeed20d869b0d4a8dcd3c763b5dee7158f912ad (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit b1781295959566608326b69440d8d3ae8e4da4ee
Author: radhika <radhika at curoverse.com>
Date: Tue Nov 10 10:52:35 2015 -0500
7661: added test with only_pdh (not working yet)
diff --git a/services/fuse/bin/arv-mount b/services/fuse/bin/arv-mount
index 81f8ca6..d155534 100755
--- a/services/fuse/bin/arv-mount
+++ b/services/fuse/bin/arv-mount
@@ -108,6 +108,7 @@ with "--".
if args.by_id or args.by_pdh:
# Set up the request handler with the 'magic directory' at the root
dir_class = MagicDirectory
+ dir_args.append(args.by_pdh)
elif args.by_tag:
dir_class = TagsDirectory
elif args.shared:
@@ -132,7 +133,7 @@ with "--".
e = operations.inodes.add_entry(Directory(llfuse.ROOT_INODE, operations.inodes))
dir_args[0] = e.inode
- e._entries['by_id'] = operations.inodes.add_entry(MagicDirectory(*dir_args, pdh_only=True if args.by_pdh else False))
+ e._entries['by_id'] = operations.inodes.add_entry(MagicDirectory(*dir_args))
e._entries['by_tag'] = operations.inodes.add_entry(TagsDirectory(*dir_args))
diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index ff88837..b91b141 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -1060,3 +1060,50 @@ class FuseUnitTest(unittest.TestCase):
self.assertEqual("_", fuse.sanitize_filename(""))
self.assertEqual("_", fuse.sanitize_filename("."))
self.assertEqual("__", fuse.sanitize_filename(".."))
+
+
+class FuseMagicTestPDHOnly(MountTestBase):
+ def setUp(self, api=None):
+ super(FuseMagicTestPDHOnly, self).setUp(api=api)
+
+ cw = arvados.CollectionWriter()
+
+ cw.start_new_file('thing1.txt')
+ cw.write("data 1")
+
+ self.testcollection = cw.finish()
+ self.test_manifest = cw.manifest_text()
+ 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)
+
+ mount_ls = llfuse.listdir(self.mounttmp)
+ self.assertIn('README', mount_ls)
+ self.assertFalse(any(arvados.util.keep_locator_pattern.match(fn) or
+ arvados.util.uuid_pattern.match(fn)
+ for fn in mount_ls),
+ "new FUSE MagicDirectory lists Collection")
+
+ # look up using pdh should succeed
+ self.assertDirContents(self.testcollection, ['thing1.txt'])
+ self.assertDirContents(os.path.join('by_id', self.testcollection),
+ ['thing1.txt'])
+ mount_ls = llfuse.listdir(self.mounttmp)
+ self.assertIn('README', mount_ls)
+ self.assertIn(self.testcollection, mount_ls)
+ self.assertIn(self.testcollection,
+ llfuse.listdir(os.path.join(self.mounttmp, 'by_id')))
+
+ files = {}
+ files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = 'data 1'
+
+ for k, v in files.items():
+ 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):
+ self.assertDirContents(os.path.join('by_id', self.testcollectionuuid),
+ ['thing1.txt'])
commit 7fae6271dd3b05db5a7f084cf686f7388e2822db
Merge: b5c48c0 b958fc6
Author: radhika <radhika at curoverse.com>
Date: Mon Nov 9 15:41:46 2015 -0500
Merge branch 'master' into 7661-fuse-by-pdh
commit b5c48c07a2618740eab353150a450fb62bb4ceee
Merge: ddeed20 5d74e75
Author: radhika <radhika at curoverse.com>
Date: Mon Nov 9 14:01:17 2015 -0500
Merge branch 'master' into 7661-fuse-by-pdh
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list