projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3961: fix FuseSharedTest
[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 9627777a527aa87a2040eec56a9f7027086aaa94..256f820619f6ee7dbb7da950fd72dea4600618bf 100644
(file)
--- a/
services/fuse/tests/test_mount.py
+++ b/
services/fuse/tests/test_mount.py
@@
-73,7
+73,7
@@
class FuseMountTest(MountTestBase):
def runTest(self):
# Create the request handler
operations = fuse.Operations(os.getuid(), os.getgid())
def runTest(self):
# Create the request handler
operations = fuse.Operations(os.getuid(), os.getgid())
- e = operations.inodes.add_entry(fuse.CollectionDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, self.testcollection))
+ e = operations.inodes.add_entry(fuse.CollectionDirectory(llfuse.ROOT_INODE, operations.inodes, self.api,
0,
self.testcollection))
llfuse.init(operations, self.mounttmp, [])
t = threading.Thread(None, lambda: llfuse.main())
llfuse.init(operations, self.mounttmp, [])
t = threading.Thread(None, lambda: llfuse.main())
@@
-128,7
+128,7
@@
class FuseMagicTest(MountTestBase):
def runTest(self):
# Create the request handler
operations = fuse.Operations(os.getuid(), os.getgid())
def runTest(self):
# Create the request handler
operations = fuse.Operations(os.getuid(), os.getgid())
- e = operations.inodes.add_entry(fuse.MagicDirectory(llfuse.ROOT_INODE, operations.inodes, self.api))
+ e = operations.inodes.add_entry(fuse.MagicDirectory(llfuse.ROOT_INODE, operations.inodes, self.api
, 0
))
self.mounttmp = tempfile.mkdtemp()
self.mounttmp = tempfile.mkdtemp()
@@
-163,7
+163,7
@@
class FuseMagicTest(MountTestBase):
class FuseTagsTest(MountTestBase):
def runTest(self):
operations = fuse.Operations(os.getuid(), os.getgid())
class FuseTagsTest(MountTestBase):
def runTest(self):
operations = fuse.Operations(os.getuid(), os.getgid())
- e = operations.inodes.add_entry(fuse.TagsDirectory(llfuse.ROOT_INODE, operations.inodes, self.api))
+ e = operations.inodes.add_entry(fuse.TagsDirectory(llfuse.ROOT_INODE, operations.inodes, self.api
, 0
))
llfuse.init(operations, self.mounttmp, [])
t = threading.Thread(None, lambda: llfuse.main())
llfuse.init(operations, self.mounttmp, [])
t = threading.Thread(None, lambda: llfuse.main())
@@
-188,7
+188,7
@@
class FuseTagsTest(MountTestBase):
class FuseTagsUpdateTest(MountTestBase):
def runRealTest(self):
operations = fuse.Operations(os.getuid(), os.getgid())
class FuseTagsUpdateTest(MountTestBase):
def runRealTest(self):
operations = fuse.Operations(os.getuid(), os.getgid())
- e = operations.inodes.add_entry(fuse.TagsDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, poll_time=1))
+ e = operations.inodes.add_entry(fuse.TagsDirectory(llfuse.ROOT_INODE, operations.inodes, self.api,
0,
poll_time=1))
llfuse.init(operations, self.mounttmp, [])
t = threading.Thread(None, lambda: llfuse.main())
llfuse.init(operations, self.mounttmp, [])
t = threading.Thread(None, lambda: llfuse.main())
@@
-241,7
+241,7
@@
class FuseTagsUpdateTest(MountTestBase):
class FuseSharedTest(MountTestBase):
def runTest(self):
operations = fuse.Operations(os.getuid(), os.getgid())
class FuseSharedTest(MountTestBase):
def runTest(self):
operations = fuse.Operations(os.getuid(), os.getgid())
- e = operations.inodes.add_entry(fuse.SharedDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, self.api.users().current().execute()['uuid']))
+ e = operations.inodes.add_entry(fuse.SharedDirectory(llfuse.ROOT_INODE, operations.inodes, self.api,
0,
self.api.users().current().execute()['uuid']))
llfuse.init(operations, self.mounttmp, [])
t = threading.Thread(None, lambda: llfuse.main())
llfuse.init(operations, self.mounttmp, [])
t = threading.Thread(None, lambda: llfuse.main())
@@
-262,7
+262,11
@@
class FuseSharedTest(MountTestBase):
"Pipeline Template with Input Parameter with Search.pipelineTemplate",
"Pipeline Template with Jobspec Components.pipelineTemplate",
"collection_expires_in_future",
"Pipeline Template with Input Parameter with Search.pipelineTemplate",
"Pipeline Template with Jobspec Components.pipelineTemplate",
"collection_expires_in_future",
- "pipeline_with_job.pipelineInstance"
+ "collection_with_same_name_in_aproject_and_home_project",
+ "owned_by_active",
+ "pipeline_to_merge_params.pipelineInstance",
+ "pipeline_with_job.pipelineInstance",
+ "pipeline_with_tagged_collection_input.pipelineInstance"
], d2)
d3 = os.listdir(os.path.join(self.mounttmp, 'Active User', 'A Project'))
], d2)
d3 = os.listdir(os.path.join(self.mounttmp, 'Active User', 'A Project'))
@@
-270,6
+274,7
@@
class FuseSharedTest(MountTestBase):
self.assertEqual(["A Subproject",
"Two Part Pipeline Template.pipelineTemplate",
"collection_to_move_around",
self.assertEqual(["A Subproject",
"Two Part Pipeline Template.pipelineTemplate",
"collection_to_move_around",
+ "collection_with_same_name_in_aproject_and_home_project",
"zzzzz-4zz18-fy296fx3hot09f7 added sometime"
], d3)
"zzzzz-4zz18-fy296fx3hot09f7 added sometime"
], d3)
@@
-281,7
+286,7
@@
class FuseSharedTest(MountTestBase):
class FuseHomeTest(MountTestBase):
def runTest(self):
operations = fuse.Operations(os.getuid(), os.getgid())
class FuseHomeTest(MountTestBase):
def runTest(self):
operations = fuse.Operations(os.getuid(), os.getgid())
- e = operations.inodes.add_entry(fuse.ProjectDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, self.api.users().current().execute()))
+ e = operations.inodes.add_entry(fuse.ProjectDirectory(llfuse.ROOT_INODE, operations.inodes, self.api,
0,
self.api.users().current().execute()))
llfuse.init(operations, self.mounttmp, [])
t = threading.Thread(None, lambda: llfuse.main())
llfuse.init(operations, self.mounttmp, [])
t = threading.Thread(None, lambda: llfuse.main())