From ddc1f6b0c54b72df395cfef26e0dc4eb8f65463d Mon Sep 17 00:00:00 2001 From: Tim Pierce Date: Wed, 29 Oct 2014 15:12:47 -0400 Subject: [PATCH] 4040: update FUSE driver tests with stable fixtures Added test fixtures specifically for FUSE driver tests. --- .../fixtures/api_client_authorizations.yml | 7 ++++ services/api/test/fixtures/collections.yml | 36 +++++++++++++++++ services/api/test/fixtures/groups.yml | 12 ++++++ .../api/test/fixtures/pipeline_templates.yml | 21 ++++++++++ services/api/test/fixtures/users.yml | 14 +++++++ services/fuse/tests/test_mount.py | 39 +++++++------------ 6 files changed, 104 insertions(+), 25 deletions(-) diff --git a/services/api/test/fixtures/api_client_authorizations.yml b/services/api/test/fixtures/api_client_authorizations.yml index 3b5df3795c..54329b0e93 100644 --- a/services/api/test/fixtures/api_client_authorizations.yml +++ b/services/api/test/fixtures/api_client_authorizations.yml @@ -192,3 +192,10 @@ user1_with_load: user: user1_with_load api_token: 1234k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi expires_at: 2038-01-01 00:00:00 + +fuse: + api_client: untrusted + user: fuse + api_token: 4nagbkv8eap0uok7pxm72nossq5asihls3yn5p4xmvqx5t5e7p + expires_at: 2038-01-01 00:00:00 + diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml index 777c1d319a..091cfd5c68 100644 --- a/services/api/test/fixtures/collections.yml +++ b/services/api/test/fixtures/collections.yml @@ -279,6 +279,42 @@ collection_with_files_in_subdir: updated_at: 2014-02-03T17:22:54Z manifest_text: ". 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae@545a9920 0:95:file_in_subdir1\n./subdir2/subdir3 2bbc341c702df4d8f42ec31f16c10120+64+A315d7e7bad2ce937e711fc454fae2d1194d14d64@545a9920 0:32:file1_in_subdir3.txt 32:32:file2_in_subdir3.txt\n./subdir2/subdir3/subdir4 2bbc341c702df4d8f42ec31f16c10120+64+A315d7e7bad2ce937e711fc454fae2d1194d14d64@545a9920 0:32:file1_in_subdir4.txt 32:32:file2_in_subdir4.txt" +collection_owned_by_fuse_1: + uuid: zzzzz-4zz18-ovx05bfzormx3bg + portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45 + owner_uuid: zzzzz-tpzed-0fusedrivertest + created_at: 2014-02-03T17:22:54Z + modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr + modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f + modified_at: 2014-02-03T17:22:54Z + updated_at: 2014-02-03T17:22:54Z + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" + name: "collection #1 owned by FUSE" + +collection_owned_by_fuse_2: + uuid: zzzzz-4zz18-8ubpy4w74twtwzr + portable_data_hash: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45 + owner_uuid: zzzzz-tpzed-0fusedrivertest + created_at: 2014-02-03T17:22:54Z + modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr + modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f + modified_at: 2014-02-03T17:22:54Z + updated_at: 2014-02-03T17:22:54Z + manifest_text: ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo\n" + name: "collection #2 owned by FUSE" + +collection_in_fuse_project: + uuid: zzzzz-4zz18-vx4mtkjqfrb534f + portable_data_hash: ea10d51bcf88862dbcc36eb292017dfd+45 + owner_uuid: zzzzz-j7d0g-0000ownedbyfuse + created_at: 2014-02-03T17:22:54Z + modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr + modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f + modified_at: 2014-02-03T17:22:54Z + updated_at: 2014-02-03T17:22:54Z + manifest_text: ". 73feffa4b7f6bb68e44cf984c85f6e88+3 0:3:baz\n" + name: "collection in FUSE project" + # 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/groups.yml b/services/api/test/fixtures/groups.yml index 764261daea..0143ff12a1 100644 --- a/services/api/test/fixtures/groups.yml +++ b/services/api/test/fixtures/groups.yml @@ -196,3 +196,15 @@ project_with_25_pipelines: name: project with 25 pipelines description: project with 25 pipelines group_class: project + +fuse_owned_project: + uuid: zzzzz-j7d0g-0000ownedbyfuse + owner_uuid: zzzzz-tpzed-0fusedrivertest + created_at: 2014-04-21 15:37:48 -0400 + modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr + modified_by_user_uuid: zzzzz-tpzed-0fusedrivertest + modified_at: 2014-04-21 15:37:48 -0400 + updated_at: 2014-04-21 15:37:48 -0400 + name: FUSE Test Project + description: Test project belonging to FUSE test user + group_class: project diff --git a/services/api/test/fixtures/pipeline_templates.yml b/services/api/test/fixtures/pipeline_templates.yml index 495c5e35ad..438850ad1a 100644 --- a/services/api/test/fixtures/pipeline_templates.yml +++ b/services/api/test/fixtures/pipeline_templates.yml @@ -106,3 +106,24 @@ new_pipeline_template: required: true dataclass: Collection title: bar template input + +pipeline_template_in_fuse_project: + uuid: zzzzz-p5p6p-templinfuseproj + owner_uuid: zzzzz-j7d0g-0000ownedbyfuse + created_at: 2014-04-14 12:35:04 -0400 + updated_at: 2014-04-14 12:35:04 -0400 + 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 + components: + foo_component: + script: foo + script_version: master + script_parameters: + input: + required: true + dataclass: Collection + title: "default input" + description: "input collection" + diff --git a/services/api/test/fixtures/users.yml b/services/api/test/fixtures/users.yml index 17ae82e901..ebf455aa57 100644 --- a/services/api/test/fixtures/users.yml +++ b/services/api/test/fixtures/users.yml @@ -228,3 +228,17 @@ user1_with_load: profile: organization: example.com role: IT + +fuse: + owner_uuid: zzzzz-tpzed-000000000000000 + uuid: zzzzz-tpzed-0fusedrivertest + email: fuse@arvados.local + first_name: FUSE + last_name: User + identity_url: https://fuse.openid.local + is_active: true + is_admin: false + prefs: + profile: + organization: example.com + role: IT diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index dc1f92c18f..55fd0f99a1 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -252,39 +252,28 @@ class FuseSharedTest(MountTestBase): d1 = os.listdir(self.mounttmp) d1.sort() - self.assertIn('Active User', d1) + self.assertIn('FUSE User', d1) - d2 = os.listdir(os.path.join(self.mounttmp, 'Active User')) + d2 = os.listdir(os.path.join(self.mounttmp, 'FUSE User')) d2.sort() - self.assertEqual(['A Project', - "Empty collection", - "Empty collection.link", - "Pipeline Template Newer Than Instance.pipelineTemplate", - "Pipeline Template with Input Parameter with Search.pipelineTemplate", - "Pipeline Template with Jobspec Components.pipelineTemplate", - "collection_expires_in_future", - "collection_with_same_name_in_aproject_and_home_project", - "multilevel_collection_1", - "multilevel_collection_2", - "owned_by_active", - "pipeline_to_merge_params.pipelineInstance", - "pipeline_with_job.pipelineInstance", - "pipeline_with_tagged_collection_input.pipelineInstance", - "real_log_collection" + self.assertEqual(['FUSE Test Project', + 'collection #1 owned by FUSE', + 'collection #2 owned by FUSE' ], d2) - d3 = os.listdir(os.path.join(self.mounttmp, 'Active User', 'A Project')) + d3 = os.listdir(os.path.join(self.mounttmp, 'FUSE User', 'FUSE Test Project')) d3.sort() - 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" + self.assertEqual(['Pipeline Template in FUSE Project.pipelineTemplate', + 'collection in FUSE project', ], d3) - with open(os.path.join(self.mounttmp, 'Active User', "A Project", "Two Part Pipeline Template.pipelineTemplate")) as f: + with open(os.path.join( + self.mounttmp, + 'FUSE User', + 'FUSE Test Project', + 'Pipeline Template in FUSE Project.pipelineTemplate')) as f: j = json.load(f) - self.assertEqual("Two Part Pipeline Template", j['name']) + self.assertEqual("Pipeline Template in FUSE Project", j['name']) class FuseHomeTest(MountTestBase): -- 2.39.5