From d8462cbb4c8a2c09ce1f1ae59406d714555e0ef3 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 25 Sep 2009 14:54:22 +0000
Subject: [PATCH] SE-133 YeastX: integration tests
SVN: 12712
---
integration-tests/run.sh | 4 +-
.../openBIS-server/test_database.sql | 784 ------------------
integration-tests/test-3v.sh | 98 ++-
integration-tests/test-yeastx.sh | 37 +-
4 files changed, 67 insertions(+), 856 deletions(-)
diff --git a/integration-tests/run.sh b/integration-tests/run.sh
index 129d7f2ba30..1eb8001a9bc 100755
--- a/integration-tests/run.sh
+++ b/integration-tests/run.sh
@@ -1,4 +1,4 @@
-source test-3v.sh
-main $@
+./test-3v.sh $@
+#./test-yeastx.sh $@
diff --git a/integration-tests/templates/openBIS-server/test_database.sql b/integration-tests/templates/openBIS-server/test_database.sql
index 5b34c8636ff..a6ec6f51758 100644
--- a/integration-tests/templates/openBIS-server/test_database.sql
+++ b/integration-tests/templates/openBIS-server/test_database.sql
@@ -4449,787 +4449,3 @@ GRANT ALL ON SCHEMA public TO postgres;
GRANT ALL ON SCHEMA public TO PUBLIC;
---
--- Name: attachment_content_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE attachment_content_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE attachment_content_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE attachment_content_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE attachment_content_id_seq TO openbis_readonly;
-
-
---
--- Name: attachment_contents; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE attachment_contents FROM PUBLIC;
-REVOKE ALL ON TABLE attachment_contents FROM tpylak;
-GRANT ALL ON TABLE attachment_contents TO tpylak;
-GRANT SELECT ON TABLE attachment_contents TO openbis_readonly;
-
-
---
--- Name: attachment_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE attachment_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE attachment_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE attachment_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE attachment_id_seq TO openbis_readonly;
-
-
---
--- Name: attachments; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE attachments FROM PUBLIC;
-REVOKE ALL ON TABLE attachments FROM tpylak;
-GRANT ALL ON TABLE attachments TO tpylak;
-GRANT SELECT ON TABLE attachments TO openbis_readonly;
-
-
---
--- Name: authorization_group_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE authorization_group_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE authorization_group_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE authorization_group_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE authorization_group_id_seq TO openbis_readonly;
-
-
---
--- Name: authorization_group_persons; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE authorization_group_persons FROM PUBLIC;
-REVOKE ALL ON TABLE authorization_group_persons FROM tpylak;
-GRANT ALL ON TABLE authorization_group_persons TO tpylak;
-GRANT SELECT ON TABLE authorization_group_persons TO openbis_readonly;
-
-
---
--- Name: authorization_groups; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE authorization_groups FROM PUBLIC;
-REVOKE ALL ON TABLE authorization_groups FROM tpylak;
-GRANT ALL ON TABLE authorization_groups TO tpylak;
-GRANT SELECT ON TABLE authorization_groups TO openbis_readonly;
-
-
---
--- Name: code_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE code_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE code_seq FROM tpylak;
-GRANT ALL ON SEQUENCE code_seq TO tpylak;
-GRANT SELECT ON SEQUENCE code_seq TO openbis_readonly;
-
-
---
--- Name: controlled_vocabularies; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE controlled_vocabularies FROM PUBLIC;
-REVOKE ALL ON TABLE controlled_vocabularies FROM tpylak;
-GRANT ALL ON TABLE controlled_vocabularies TO tpylak;
-GRANT SELECT ON TABLE controlled_vocabularies TO openbis_readonly;
-
-
---
--- Name: controlled_vocabulary_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE controlled_vocabulary_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE controlled_vocabulary_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE controlled_vocabulary_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE controlled_vocabulary_id_seq TO openbis_readonly;
-
-
---
--- Name: controlled_vocabulary_terms; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE controlled_vocabulary_terms FROM PUBLIC;
-REVOKE ALL ON TABLE controlled_vocabulary_terms FROM tpylak;
-GRANT ALL ON TABLE controlled_vocabulary_terms TO tpylak;
-GRANT SELECT ON TABLE controlled_vocabulary_terms TO openbis_readonly;
-
-
---
--- Name: cvte_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE cvte_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE cvte_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE cvte_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE cvte_id_seq TO openbis_readonly;
-
-
---
--- Name: data; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE data FROM PUBLIC;
-REVOKE ALL ON TABLE data FROM tpylak;
-GRANT ALL ON TABLE data TO tpylak;
-GRANT SELECT ON TABLE data TO openbis_readonly;
-
-
---
--- Name: data_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE data_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE data_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE data_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE data_id_seq TO openbis_readonly;
-
-
---
--- Name: data_set_properties; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE data_set_properties FROM PUBLIC;
-REVOKE ALL ON TABLE data_set_properties FROM tpylak;
-GRANT ALL ON TABLE data_set_properties TO tpylak;
-GRANT SELECT ON TABLE data_set_properties TO openbis_readonly;
-
-
---
--- Name: data_set_property_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE data_set_property_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE data_set_property_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE data_set_property_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE data_set_property_id_seq TO openbis_readonly;
-
-
---
--- Name: data_set_relationship_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE data_set_relationship_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE data_set_relationship_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE data_set_relationship_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE data_set_relationship_id_seq TO openbis_readonly;
-
-
---
--- Name: data_set_relationships; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE data_set_relationships FROM PUBLIC;
-REVOKE ALL ON TABLE data_set_relationships FROM tpylak;
-GRANT ALL ON TABLE data_set_relationships TO tpylak;
-GRANT SELECT ON TABLE data_set_relationships TO openbis_readonly;
-
-
---
--- Name: data_set_type_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE data_set_type_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE data_set_type_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE data_set_type_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE data_set_type_id_seq TO openbis_readonly;
-
-
---
--- Name: data_set_type_property_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE data_set_type_property_types FROM PUBLIC;
-REVOKE ALL ON TABLE data_set_type_property_types FROM tpylak;
-GRANT ALL ON TABLE data_set_type_property_types TO tpylak;
-GRANT SELECT ON TABLE data_set_type_property_types TO openbis_readonly;
-
-
---
--- Name: data_set_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE data_set_types FROM PUBLIC;
-REVOKE ALL ON TABLE data_set_types FROM tpylak;
-GRANT ALL ON TABLE data_set_types TO tpylak;
-GRANT SELECT ON TABLE data_set_types TO openbis_readonly;
-
-
---
--- Name: data_store_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE data_store_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE data_store_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE data_store_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE data_store_id_seq TO openbis_readonly;
-
-
---
--- Name: data_store_service_data_set_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE data_store_service_data_set_types FROM PUBLIC;
-REVOKE ALL ON TABLE data_store_service_data_set_types FROM tpylak;
-GRANT ALL ON TABLE data_store_service_data_set_types TO tpylak;
-GRANT SELECT ON TABLE data_store_service_data_set_types TO openbis_readonly;
-
-
---
--- Name: data_store_services; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE data_store_services FROM PUBLIC;
-REVOKE ALL ON TABLE data_store_services FROM tpylak;
-GRANT ALL ON TABLE data_store_services TO tpylak;
-GRANT SELECT ON TABLE data_store_services TO openbis_readonly;
-
-
---
--- Name: data_store_services_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE data_store_services_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE data_store_services_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE data_store_services_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE data_store_services_id_seq TO openbis_readonly;
-
-
---
--- Name: data_stores; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE data_stores FROM PUBLIC;
-REVOKE ALL ON TABLE data_stores FROM tpylak;
-GRANT ALL ON TABLE data_stores TO tpylak;
-GRANT SELECT ON TABLE data_stores TO openbis_readonly;
-
-
---
--- Name: data_type_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE data_type_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE data_type_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE data_type_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE data_type_id_seq TO openbis_readonly;
-
-
---
--- Name: data_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE data_types FROM PUBLIC;
-REVOKE ALL ON TABLE data_types FROM tpylak;
-GRANT ALL ON TABLE data_types TO tpylak;
-GRANT SELECT ON TABLE data_types TO openbis_readonly;
-
-
---
--- Name: database_instance_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE database_instance_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE database_instance_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE database_instance_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE database_instance_id_seq TO openbis_readonly;
-
-
---
--- Name: database_instances; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE database_instances FROM PUBLIC;
-REVOKE ALL ON TABLE database_instances FROM tpylak;
-GRANT ALL ON TABLE database_instances TO tpylak;
-GRANT SELECT ON TABLE database_instances TO openbis_readonly;
-
-
---
--- Name: database_version_logs; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE database_version_logs FROM PUBLIC;
-REVOKE ALL ON TABLE database_version_logs FROM tpylak;
-GRANT ALL ON TABLE database_version_logs TO tpylak;
-GRANT SELECT ON TABLE database_version_logs TO openbis_readonly;
-
-
---
--- Name: dstpt_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE dstpt_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE dstpt_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE dstpt_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE dstpt_id_seq TO openbis_readonly;
-
-
---
--- Name: etpt_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE etpt_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE etpt_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE etpt_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE etpt_id_seq TO openbis_readonly;
-
-
---
--- Name: event_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE event_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE event_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE event_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE event_id_seq TO openbis_readonly;
-
-
---
--- Name: events; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE events FROM PUBLIC;
-REVOKE ALL ON TABLE events FROM tpylak;
-GRANT ALL ON TABLE events TO tpylak;
-GRANT SELECT ON TABLE events TO openbis_readonly;
-
-
---
--- Name: experiment_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE experiment_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE experiment_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE experiment_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE experiment_id_seq TO openbis_readonly;
-
-
---
--- Name: experiment_properties; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE experiment_properties FROM PUBLIC;
-REVOKE ALL ON TABLE experiment_properties FROM tpylak;
-GRANT ALL ON TABLE experiment_properties TO tpylak;
-GRANT SELECT ON TABLE experiment_properties TO openbis_readonly;
-
-
---
--- Name: experiment_property_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE experiment_property_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE experiment_property_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE experiment_property_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE experiment_property_id_seq TO openbis_readonly;
-
-
---
--- Name: experiment_type_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE experiment_type_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE experiment_type_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE experiment_type_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE experiment_type_id_seq TO openbis_readonly;
-
-
---
--- Name: experiment_type_property_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE experiment_type_property_types FROM PUBLIC;
-REVOKE ALL ON TABLE experiment_type_property_types FROM tpylak;
-GRANT ALL ON TABLE experiment_type_property_types TO tpylak;
-GRANT SELECT ON TABLE experiment_type_property_types TO openbis_readonly;
-
-
---
--- Name: experiment_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE experiment_types FROM PUBLIC;
-REVOKE ALL ON TABLE experiment_types FROM tpylak;
-GRANT ALL ON TABLE experiment_types TO tpylak;
-GRANT SELECT ON TABLE experiment_types TO openbis_readonly;
-
-
---
--- Name: experiments; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE experiments FROM PUBLIC;
-REVOKE ALL ON TABLE experiments FROM tpylak;
-GRANT ALL ON TABLE experiments TO tpylak;
-GRANT SELECT ON TABLE experiments TO openbis_readonly;
-
-
---
--- Name: external_data; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE external_data FROM PUBLIC;
-REVOKE ALL ON TABLE external_data FROM tpylak;
-GRANT ALL ON TABLE external_data TO tpylak;
-GRANT SELECT ON TABLE external_data TO openbis_readonly;
-
-
---
--- Name: file_format_type_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE file_format_type_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE file_format_type_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE file_format_type_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE file_format_type_id_seq TO openbis_readonly;
-
-
---
--- Name: file_format_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE file_format_types FROM PUBLIC;
-REVOKE ALL ON TABLE file_format_types FROM tpylak;
-GRANT ALL ON TABLE file_format_types TO tpylak;
-GRANT SELECT ON TABLE file_format_types TO openbis_readonly;
-
-
---
--- Name: filter_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE filter_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE filter_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE filter_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE filter_id_seq TO openbis_readonly;
-
-
---
--- Name: filters; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE filters FROM PUBLIC;
-REVOKE ALL ON TABLE filters FROM tpylak;
-GRANT ALL ON TABLE filters TO tpylak;
-GRANT SELECT ON TABLE filters TO openbis_readonly;
-
-
---
--- Name: group_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE group_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE group_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE group_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE group_id_seq TO openbis_readonly;
-
-
---
--- Name: groups; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE groups FROM PUBLIC;
-REVOKE ALL ON TABLE groups FROM tpylak;
-GRANT ALL ON TABLE groups TO tpylak;
-GRANT SELECT ON TABLE groups TO openbis_readonly;
-
-
---
--- Name: invalidation_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE invalidation_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE invalidation_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE invalidation_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE invalidation_id_seq TO openbis_readonly;
-
-
---
--- Name: invalidations; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE invalidations FROM PUBLIC;
-REVOKE ALL ON TABLE invalidations FROM tpylak;
-GRANT ALL ON TABLE invalidations TO tpylak;
-GRANT SELECT ON TABLE invalidations TO openbis_readonly;
-
-
---
--- Name: locator_type_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE locator_type_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE locator_type_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE locator_type_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE locator_type_id_seq TO openbis_readonly;
-
-
---
--- Name: locator_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE locator_types FROM PUBLIC;
-REVOKE ALL ON TABLE locator_types FROM tpylak;
-GRANT ALL ON TABLE locator_types TO tpylak;
-GRANT SELECT ON TABLE locator_types TO openbis_readonly;
-
-
---
--- Name: material_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE material_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE material_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE material_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE material_id_seq TO openbis_readonly;
-
-
---
--- Name: material_properties; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE material_properties FROM PUBLIC;
-REVOKE ALL ON TABLE material_properties FROM tpylak;
-GRANT ALL ON TABLE material_properties TO tpylak;
-GRANT SELECT ON TABLE material_properties TO openbis_readonly;
-
-
---
--- Name: material_property_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE material_property_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE material_property_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE material_property_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE material_property_id_seq TO openbis_readonly;
-
-
---
--- Name: material_type_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE material_type_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE material_type_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE material_type_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE material_type_id_seq TO openbis_readonly;
-
-
---
--- Name: material_type_property_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE material_type_property_types FROM PUBLIC;
-REVOKE ALL ON TABLE material_type_property_types FROM tpylak;
-GRANT ALL ON TABLE material_type_property_types TO tpylak;
-GRANT SELECT ON TABLE material_type_property_types TO openbis_readonly;
-
-
---
--- Name: material_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE material_types FROM PUBLIC;
-REVOKE ALL ON TABLE material_types FROM tpylak;
-GRANT ALL ON TABLE material_types TO tpylak;
-GRANT SELECT ON TABLE material_types TO openbis_readonly;
-
-
---
--- Name: materials; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE materials FROM PUBLIC;
-REVOKE ALL ON TABLE materials FROM tpylak;
-GRANT ALL ON TABLE materials TO tpylak;
-GRANT SELECT ON TABLE materials TO openbis_readonly;
-
-
---
--- Name: mtpt_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE mtpt_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE mtpt_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE mtpt_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE mtpt_id_seq TO openbis_readonly;
-
-
---
--- Name: perm_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE perm_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE perm_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE perm_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE perm_id_seq TO openbis_readonly;
-
-
---
--- Name: person_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE person_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE person_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE person_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE person_id_seq TO openbis_readonly;
-
-
---
--- Name: persons; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE persons FROM PUBLIC;
-REVOKE ALL ON TABLE persons FROM tpylak;
-GRANT ALL ON TABLE persons TO tpylak;
-GRANT SELECT ON TABLE persons TO openbis_readonly;
-
-
---
--- Name: project_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE project_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE project_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE project_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE project_id_seq TO openbis_readonly;
-
-
---
--- Name: projects; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE projects FROM PUBLIC;
-REVOKE ALL ON TABLE projects FROM tpylak;
-GRANT ALL ON TABLE projects TO tpylak;
-GRANT SELECT ON TABLE projects TO openbis_readonly;
-
-
---
--- Name: property_type_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE property_type_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE property_type_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE property_type_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE property_type_id_seq TO openbis_readonly;
-
-
---
--- Name: property_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE property_types FROM PUBLIC;
-REVOKE ALL ON TABLE property_types FROM tpylak;
-GRANT ALL ON TABLE property_types TO tpylak;
-GRANT SELECT ON TABLE property_types TO openbis_readonly;
-
-
---
--- Name: role_assignment_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE role_assignment_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE role_assignment_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE role_assignment_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE role_assignment_id_seq TO openbis_readonly;
-
-
---
--- Name: role_assignments; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE role_assignments FROM PUBLIC;
-REVOKE ALL ON TABLE role_assignments FROM tpylak;
-GRANT ALL ON TABLE role_assignments TO tpylak;
-GRANT SELECT ON TABLE role_assignments TO openbis_readonly;
-
-
---
--- Name: sample_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE sample_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE sample_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE sample_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE sample_id_seq TO openbis_readonly;
-
-
---
--- Name: sample_properties; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE sample_properties FROM PUBLIC;
-REVOKE ALL ON TABLE sample_properties FROM tpylak;
-GRANT ALL ON TABLE sample_properties TO tpylak;
-GRANT SELECT ON TABLE sample_properties TO openbis_readonly;
-
-
---
--- Name: sample_property_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE sample_property_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE sample_property_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE sample_property_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE sample_property_id_seq TO openbis_readonly;
-
-
---
--- Name: sample_type_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE sample_type_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE sample_type_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE sample_type_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE sample_type_id_seq TO openbis_readonly;
-
-
---
--- Name: sample_type_property_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE sample_type_property_types FROM PUBLIC;
-REVOKE ALL ON TABLE sample_type_property_types FROM tpylak;
-GRANT ALL ON TABLE sample_type_property_types TO tpylak;
-GRANT SELECT ON TABLE sample_type_property_types TO openbis_readonly;
-
-
---
--- Name: sample_types; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE sample_types FROM PUBLIC;
-REVOKE ALL ON TABLE sample_types FROM tpylak;
-GRANT ALL ON TABLE sample_types TO tpylak;
-GRANT SELECT ON TABLE sample_types TO openbis_readonly;
-
-
---
--- Name: samples; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON TABLE samples FROM PUBLIC;
-REVOKE ALL ON TABLE samples FROM tpylak;
-GRANT ALL ON TABLE samples TO tpylak;
-GRANT SELECT ON TABLE samples TO openbis_readonly;
-
-
---
--- Name: stpt_id_seq; Type: ACL; Schema: public; Owner: -
---
-
-REVOKE ALL ON SEQUENCE stpt_id_seq FROM PUBLIC;
-REVOKE ALL ON SEQUENCE stpt_id_seq FROM tpylak;
-GRANT ALL ON SEQUENCE stpt_id_seq TO tpylak;
-GRANT SELECT ON SEQUENCE stpt_id_seq TO openbis_readonly;
-
-
---
--- PostgreSQL database dump complete
---
-
diff --git a/integration-tests/test-3v.sh b/integration-tests/test-3v.sh
index 1e94cc2b112..e45b7160a0f 100755
--- a/integration-tests/test-3v.sh
+++ b/integration-tests/test-3v.sh
@@ -306,53 +306,51 @@ function integration_tests_3v {
# -- MAIN ------------
-function main {
- if [ "$1" = "--clean" ]; then
- clean_after_tests
- else
- install_dss=false
- install_dmv=false
- install_openbis=false
- use_local_source=false
- reinstall_all=false
- while [ ! "$1" = "" ]; do
- case "$1" in
- '-e'|'--dss')
- install_dss=true
- ;;
- '-d'|'--dmv')
- install_dmv=true
- ;;
- '-o'|'--openbis')
- install_openbis=true
- ;;
- '-a'|'--all')
- install_dss=true
- install_dmv=true
- install_openbis=true
- ;;
- '--local-source')
- use_local_source=true
- ;;
- '--reinstall-all')
- reinstall_all=true
- ;;
- '--help')
- print_help
- exit 0
- ;;
- '--assert-content')
- assert_correct_content_3v
- exit 0
- ;;
- *)
- echo "Illegal option $1."
- print_help
- exit 1
- ;;
- esac
- shift
- done
- integration_tests_3v $install_dss $install_dmv $install_openbis $use_local_source $reinstall_all
- fi
-}
\ No newline at end of file
+if [ "$1" = "--clean" ]; then
+ clean_after_tests
+else
+ install_dss=false
+ install_dmv=false
+ install_openbis=false
+ use_local_source=false
+ reinstall_all=false
+ while [ ! "$1" = "" ]; do
+ case "$1" in
+ '-e'|'--dss')
+ install_dss=true
+ ;;
+ '-d'|'--dmv')
+ install_dmv=true
+ ;;
+ '-o'|'--openbis')
+ install_openbis=true
+ ;;
+ '-a'|'--all')
+ install_dss=true
+ install_dmv=true
+ install_openbis=true
+ ;;
+ '--local-source')
+ use_local_source=true
+ ;;
+ '--reinstall-all')
+ reinstall_all=true
+ ;;
+ '--help')
+ print_help
+ exit 0
+ ;;
+ '--assert-content')
+ assert_correct_content_3v
+ exit 0
+ ;;
+ *)
+ echo "Illegal option $1."
+ print_help
+ exit 1
+ ;;
+ esac
+ shift
+ done
+ integration_tests_3v $install_dss $install_dmv $install_openbis $use_local_source $reinstall_all
+fi
diff --git a/integration-tests/test-yeastx.sh b/integration-tests/test-yeastx.sh
index 4a9623f7cf1..0fb78fdc2fd 100755
--- a/integration-tests/test-yeastx.sh
+++ b/integration-tests/test-yeastx.sh
@@ -103,26 +103,22 @@ function assert_correct_errorlogs {
fi
}
+function count_db_table_records {
+ local db=$1
+ local table=$2
+
+ local psql=`run_psql`
+ local count=`$psql -U postgres -d $db -c "select count(*) from $table" \
+ | head -n 3 | tail -n 1 | awk '{gsub(/ /,"");print}'
+ echo $count
+}
+
function assert_correct_datasets_metabol_database {
- local dataset_id=$1
- local pattern=$2
- echo ==== assert correct dataset $dataset_id content in database with pattern $pattern ====
- local psql=`run_psql`
- local dataset=`$psql -U postgres -d $DATABASE \
- -c "select d.id, e.code, ds.code, d.code, d.is_placeholder, r.data_id_parent, \
- ed.is_complete, d.data_producer_code, d.production_timestamp \
- from data as d left join data_set_relationships as r on r.data_id_child = d.id \
- left join data_stores as ds on ds.id = d.dast_id \
- left join external_data as ed on ed.data_id = d.id,
- experiments as e
- where d.id = $dataset_id and d.expe_id = e.id" \
- | awk '/ +[0-9]+/' \
- | awk '{gsub(/ /,"");print}' \
- | awk '{gsub(/\|/,";");print}'`
- local lines=`echo "$dataset" | grep "$pattern" | wc -l`
- if [ $lines == 0 ]; then
- report_error dataset does not match pattern $pattern: $dataset
- fi
+ local eicms_runs=`count_db_table_records $METABOL_DB eic_ms_runs`
+ local fiams_runs=`count_db_table_records $METABOL_DB fia_ms_runs`
+
+ assert_equals "Wrong number of eic MS runs in the metablomics db" 1 $eicms_runs
+ assert_equals "Wrong number of fia MS runs in the metablomics db" 1 $fiams_runs
}
function assert_correct_incoming_contents {
@@ -154,7 +150,7 @@ function assert_correct_incoming_contents {
local store_files_count=`find $store -type f | wc -l`
assert_equals "Wrong number of files in the store $store" 14 $store_files_count
-
+ assert_correct_datasets_metabol_database
}
@@ -172,6 +168,7 @@ function integration_tests_yeastx {
exit_if_assertion_failed
}
+# TODO
integration_tests_yeastx true
#assert_correct_incoming_contents $MY_DATA/incoming
#exit_if_assertion_failed
--
GitLab