[ARVADOS] updated: f39bdf87343e1e8a2c5c81221d262422c2651de2
git at public.curoverse.com
git at public.curoverse.com
Fri Oct 31 16:23:40 EDT 2014
Summary of changes:
services/api/test/fixtures/collections.yml | 4 +--
services/api/test/fixtures/links.yml | 15 ++++++++++
services/api/test/fixtures/pipeline_instances.yml | 35 +++++++++++++++++++++++
services/api/test/fixtures/pipeline_templates.yml | 2 +-
services/fuse/tests/test_mount.py | 30 +++++++++++--------
5 files changed, 71 insertions(+), 15 deletions(-)
via f39bdf87343e1e8a2c5c81221d262422c2651de2 (commit)
from 52141835e85e4014a691e036f89bcd71a98bd6b2 (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 f39bdf87343e1e8a2c5c81221d262422c2651de2
Author: Tim Pierce <twp at curoverse.com>
Date: Fri Oct 31 16:21:11 2014 -0400
4040: code review feedback
* Renamed
** collection_owned_by_fuse_1 -> collection_1_owned_by_fuse
** collection_owned_by_fuse_2 -> collection_2_owned_by_fuse
* Added fixtures pipeline_instance_owned_by_fuse and
pipeline_instance_in_fuse_project.
* Added name link for the empty collection, to exercise that links are
exposed in the filesystem in the expected way.
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index 091cfd5..caa8f56 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -279,7 +279,7 @@ collection_with_files_in_subdir:
updated_at: 2014-02-03T17:22:54Z
manifest_text: ". 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:95:file_in_subdir1\n./subdir2/subdir3 2bbc341c702df4d8f42ec31f16c10120+64+A315d7e7bad2ce937e711fc454fae2d1194d14d64 at 545a9920 0:32:file1_in_subdir3.txt 32:32:file2_in_subdir3.txt\n./subdir2/subdir3/subdir4 2bbc341c702df4d8f42ec31f16c10120+64+A315d7e7bad2ce937e711fc454fae2d1194d14d64 at 545a9920 0:32:file1_in_subdir4.txt 32:32:file2_in_subdir4.txt"
-collection_owned_by_fuse_1:
+collection_1_owned_by_fuse:
uuid: zzzzz-4zz18-ovx05bfzormx3bg
portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
owner_uuid: zzzzz-tpzed-0fusedrivertest
@@ -291,7 +291,7 @@ collection_owned_by_fuse_1:
manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
name: "collection #1 owned by FUSE"
-collection_owned_by_fuse_2:
+collection_2_owned_by_fuse:
uuid: zzzzz-4zz18-8ubpy4w74twtwzr
portable_data_hash: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45
owner_uuid: zzzzz-tpzed-0fusedrivertest
diff --git a/services/api/test/fixtures/links.yml b/services/api/test/fixtures/links.yml
index 899e9f0..0d9b06a 100644
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@ -762,3 +762,18 @@ user1-with-load_member_of_all_users_group:
name: can_read
head_uuid: zzzzz-j7d0g-fffffffffffffff
properties: {}
+
+empty_collection_name_in_fuse_user_home_project:
+ uuid: zzzzz-o0j2j-hw3mcg3c8pwo6ar
+ owner_uuid: zzzzz-tpzed-0fusedrivertest
+ created_at: 2014-08-06 22:11:51.242392533 Z
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-0fusedrivertest
+ modified_at: 2014-08-06 22:11:51.242150425 Z
+ tail_uuid: zzzzz-tpzed-0fusedrivertest
+ link_class: name
+ name: Empty collection
+ head_uuid: d41d8cd98f00b204e9800998ecf8427e+0
+ properties: {}
+ updated_at: 2014-08-06 22:11:51.242010312 Z
+
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index 53305ad..81d1338 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -150,6 +150,41 @@ pipeline_with_newer_template:
dataclass: Collection
title: foo instance input
+pipeline_instance_owned_by_fuse:
+ state: Complete
+ uuid: zzzzz-d1hrv-ri9dvgkgqs9y09j
+ owner_uuid: zzzzz-tpzed-0fusedrivertest
+ pipeline_template_uuid: zzzzz-p5p6p-vq4wuvy84xvaq2r
+ created_at: 2014-09-15 12:00:00
+ name: "pipeline instance owned by FUSE"
+ components:
+ foo:
+ script: foo
+ script_version: master
+ script_parameters:
+ input:
+ required: true
+ dataclass: Collection
+ title: foo instance input
+
+pipeline_instance_in_fuse_project:
+ state: Complete
+ uuid: zzzzz-d1hrv-scarxiyajtshq3l
+ owner_uuid: zzzzz-j7d0g-0000ownedbyfuse
+ pipeline_template_uuid: zzzzz-p5p6p-vq4wuvy84xvaq2r
+ created_at: 2014-09-15 12:00:00
+ name: "pipeline instance in FUSE project"
+ components:
+ foo:
+ script: foo
+ script_version: master
+ script_parameters:
+ input:
+ required: true
+ dataclass: Collection
+ title: foo instance input
+
+
# Test Helper trims the rest of the file
# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
diff --git a/services/api/test/fixtures/pipeline_templates.yml b/services/api/test/fixtures/pipeline_templates.yml
index 438850a..11557e9 100644
--- a/services/api/test/fixtures/pipeline_templates.yml
+++ b/services/api/test/fixtures/pipeline_templates.yml
@@ -115,7 +115,7 @@ pipeline_template_in_fuse_project:
modified_at: 2014-04-14 12:35:04 -0400
modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
modified_by_user_uuid: zzzzz-tpzed-0fusedrivertest
- name: Pipeline Template in FUSE Project
+ name: pipeline template in FUSE project
components:
foo_component:
script: foo
diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 3db5281..bb14d43 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -257,29 +257,35 @@ class FuseSharedTest(MountTestBase):
shared_dirs.sort()
self.assertIn('FUSE User', shared_dirs)
- # fuse_user_dirs is a list of the directories owned
- # by the "FUSE User" test user.
- fuse_user_dirs = os.listdir(os.path.join(self.mounttmp, 'FUSE User'))
- fuse_user_dirs.sort()
- self.assertEqual(['FUSE Test Project',
- 'collection #1 owned by FUSE',
- 'collection #2 owned by FUSE'
- ], fuse_user_dirs)
+ # fuse_user_objs is a list of the objects owned by the FUSE
+ # test user (which present as files in the 'FUSE User'
+ # directory)
+ fuse_user_objs = os.listdir(os.path.join(self.mounttmp, 'FUSE User'))
+ fuse_user_objs.sort()
+ self.assertEqual(['Empty collection.link', # permission link on collection
+ 'FUSE Test Project', # project owned by user
+ 'collection #1 owned by FUSE', # collection owned by user
+ 'collection #2 owned by FUSE', # collection owned by user
+ 'pipeline instance owned by FUSE.pipelineInstance', # pipeline instance owned by user
+ ], fuse_user_objs)
# test_proj_files is a list of the files in the FUSE Test Project.
test_proj_files = os.listdir(os.path.join(self.mounttmp, 'FUSE User', 'FUSE Test Project'))
test_proj_files.sort()
- self.assertEqual(['Pipeline Template in FUSE Project.pipelineTemplate',
- 'collection in FUSE project',
+ self.assertEqual(['collection in FUSE project',
+ 'pipeline instance in FUSE project.pipelineInstance',
+ 'pipeline template in FUSE project.pipelineTemplate'
], test_proj_files)
+ # Double check that we can open and read objects in this folder as a file,
+ # and that its contents are what we expect.
with open(os.path.join(
self.mounttmp,
'FUSE User',
'FUSE Test Project',
- 'Pipeline Template in FUSE Project.pipelineTemplate')) as f:
+ 'pipeline template in FUSE project.pipelineTemplate')) as f:
j = json.load(f)
- self.assertEqual("Pipeline Template in FUSE Project", j['name'])
+ self.assertEqual("pipeline template in FUSE project", j['name'])
class FuseHomeTest(MountTestBase):
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list