diff --git a/test/unit/data/model/mapping/conftest.py b/test/unit/data/model/mapping/conftest.py new file mode 100644 index 00000000000..f18f0b53ba2 --- /dev/null +++ b/test/unit/data/model/mapping/conftest.py @@ -0,0 +1,17 @@ +import pytest +from sqlalchemy import create_engine +from sqlalchemy.orm import scoped_session, sessionmaker + + +@pytest.fixture(scope='module') +def engine(): + db_uri = 'sqlite:///:memory:' + return create_engine(db_uri) + + +@pytest.fixture +def session(init_model, engine): + session_factory = sessionmaker(bind=engine) + Session = scoped_session(session_factory) + yield Session() + Session.remove() diff --git a/test/unit/data/model/mapping/test_install_model_mapping.py b/test/unit/data/model/mapping/test_install_model_mapping.py index b8ec0149c33..961caba3d9b 100644 --- a/test/unit/data/model/mapping/test_install_model_mapping.py +++ b/test/unit/data/model/mapping/test_install_model_mapping.py @@ -1,25 +1,20 @@ -from contextlib import contextmanager from datetime import datetime, timedelta import pytest -from sqlalchemy import ( - delete, - select, -) -import galaxy.model.tool_shed_install.mapping as mapping +from galaxy.model import tool_shed_install as model from .common import ( collection_consists_of_objects, dbcleanup, dbcleanup_wrapper, delete_from_database, get_stored_obj, - persist, ) + class BaseTest: @pytest.fixture - def cls_(self, model): + def cls_(self): """ Return class under test. Assumptions: if the class under test is Foo, then the class grouping @@ -300,41 +295,33 @@ class TestToolVersionAssociation(BaseTest): # Misc. helper fixtures. @pytest.fixture(scope='module') -def model(): - db_uri = 'sqlite:///:memory:' - return mapping.init(db_uri, create_tables=True) - - -@pytest.fixture -def session(model): - Session = model.session - yield Session() - Session.remove() # Ensures we get a new session for each test +def init_model(engine): + model.mapper_registry.metadata.create_all(engine) # Fixtures yielding persisted instances of models, deleted from the database on test exit. @pytest.fixture -def repository(model, session): +def repository(session): instance = model.ToolShedRepository() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def repository_repository_dependency_association(model, session): +def repository_repository_dependency_association(session): instance = model.RepositoryRepositoryDependencyAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def repository_dependency(model, session, repository): +def repository_dependency(session, repository): instance = model.RepositoryDependency() instance.repository = repository yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def tool_dependency(model, session, repository): +def tool_dependency(session, repository): instance = model.ToolDependency() instance.tool_shed_repository = repository instance.status = 'a' @@ -342,20 +329,22 @@ def tool_dependency(model, session, repository): @pytest.fixture -def tool_version(model, session): +def tool_version(session): instance = model.ToolVersion() yield from dbcleanup_wrapper(session, instance) +# Fixtures yielding factory functions. + @pytest.fixture -def tool_version_association_factory(model): +def tool_version_association_factory(): def make_instance(*args, **kwds): return model.ToolVersionAssociation(*args, **kwds) return make_instance @pytest.fixture -def tool_version_factory(model): +def tool_version_factory(): def make_instance(*args, **kwds): return model.ToolVersion(*args, **kwds) return make_instance diff --git a/test/unit/data/model/mapping/test_model_mapping.py b/test/unit/data/model/mapping/test_model_mapping.py index 11453ad2a84..4a923adcf05 100644 --- a/test/unit/data/model/mapping/test_model_mapping.py +++ b/test/unit/data/model/mapping/test_model_mapping.py @@ -66,7 +66,7 @@ from uuid import UUID, uuid4 import pytest from sqlalchemy import func, select -import galaxy.model.mapping as mapping +from galaxy import model from .common import ( collection_consists_of_objects, dbcleanup, @@ -82,7 +82,7 @@ from .common import ( class BaseTest: @pytest.fixture - def cls_(self, model): + def cls_(self): """ Return class under test. Assumptions: if the class under test is Foo, then the class grouping @@ -1361,7 +1361,6 @@ class TestHistory(BaseTest): def test_columns(self, session, cls_, user): create_time = datetime.now() - update_time = create_time + timedelta(hours=1) name = "a" hid_counter = 2 deleted = True @@ -1373,7 +1372,6 @@ class TestHistory(BaseTest): published = True obj = cls_(name=name, user=user) obj.create_time = create_time - obj.update_time = update_time obj.hid_counter = hid_counter obj.deleted = deleted obj.purged = purged @@ -1387,8 +1385,8 @@ class TestHistory(BaseTest): stored_obj = get_stored_obj(session, cls_, obj_id) assert stored_obj.id == obj_id assert stored_obj.create_time == create_time - # cannot test directly (trigger); applies to both column and column property - assert stored_obj.update_time + # Can't test: populated via trigger; n/a in this test setup (applies to column and column property) + assert stored_obj.update_time is None assert stored_obj.user_id == user.id assert stored_obj.name == name assert stored_obj.hid_counter == hid_counter @@ -2073,9 +2071,7 @@ class TestHistoryDatasetCollectionAssociation(BaseTest): assert collection_consists_of_objects( stored_obj.ratings, history_dataset_collection_rating_association ) - assert ( - stored_obj.job_state_summary - ) # this is a view; TODO: can we test this better? + # stored_obj.job_state_summary is a view: can't test in this setup. delete_from_database(session, copied_to_hdca) @@ -4353,7 +4349,7 @@ class TestPageRevision(BaseTest): def test_table(self, cls_): assert cls_.__tablename__ == "page_revision" - def test_columns(self, session, cls_, model, page): + def test_columns(self, session, cls_, page): title, content = "a", "b" create_time = datetime.now() update_time = create_time + timedelta(hours=1) @@ -6854,7 +6850,7 @@ class TestWorkflowStepTagAssociation(BaseTest): # # @pytest.fixture(autouse=True) @pytest.fixture() -def ensure_database_is_empty(session, model): +def ensure_database_is_empty(session): """ Auto-runs before each test and any unscoped fixtures, except session and model on which it depends. Verifies that all model tables in the database are empty. This @@ -6873,73 +6869,66 @@ def ensure_database_is_empty(session, model): assert result == 0 -@pytest.fixture(scope="module") -def model(): - db_uri = "sqlite:///:memory:" - return mapping.init("/tmp", db_uri, create_tables=True) +# Misc. helper fixtures. - -@pytest.fixture -def session(model): - Session = model.session - yield Session() - Session.remove() # Ensures we get a new session for each test +@pytest.fixture(scope='module') +def init_model(engine): + model.mapper_registry.metadata.create_all(engine) # Fixtures yielding persisted instances of models, deleted from the database on test exit. - @pytest.fixture -def api_keys(model, session): +def api_keys(session): instance = model.APIKeys(key=get_unique_value()) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def cleanup_event(model, session): +def cleanup_event(session): instance = model.CleanupEvent() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def cloud_authz(model, session, user, user_authnz_token): +def cloud_authz(session, user, user_authnz_token): instance = model.CloudAuthz(user.id, "a", "b", user_authnz_token.id, "c") yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def custos_authnz_token(model, session, user): +def custos_authnz_token(session, user): instance = model.CustosAuthnzToken() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def data_manager_history_association(model, session): +def data_manager_history_association(session): instance = model.DataManagerHistoryAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def data_manager_job_association(model, session): +def data_manager_job_association(session): instance = model.DataManagerJobAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def dataset(model, session): +def dataset(session): instance = model.Dataset() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def dataset_collection(model, session): +def dataset_collection(session): instance = model.DatasetCollection(collection_type="a") yield from dbcleanup_wrapper(session, instance) @pytest.fixture def dataset_collection_element( - model, session, dataset_collection, history_dataset_association + session, dataset_collection, history_dataset_association ): instance = model.DatasetCollectionElement( collection=dataset_collection, element=history_dataset_association @@ -6948,68 +6937,68 @@ def dataset_collection_element( @pytest.fixture -def dataset_hash(model, session): +def dataset_hash(session): instance = model.DatasetHash() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def dataset_permission(model, session, dataset): +def dataset_permission(session, dataset): instance = model.DatasetPermissions("a", dataset) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def dataset_source(model, session): +def dataset_source(session): instance = model.DatasetSource() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def dataset_source_hash(model, session): +def dataset_source_hash(session): instance = model.DatasetSourceHash() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def default_history_permissions(model, session, history, role): +def default_history_permissions(session, history, role): instance = model.DefaultHistoryPermissions(history, "a", role) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def default_quota_association(model, session, quota): +def default_quota_association(session, quota): type_ = model.DefaultQuotaAssociation.types.REGISTERED instance = model.DefaultQuotaAssociation(type_, quota) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def default_user_permissions(model, session, user, role): +def default_user_permissions(session, user, role): instance = model.DefaultUserPermissions(user, None, role) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def dynamic_tool(model, session): +def dynamic_tool(session): instance = model.DynamicTool() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def extended_metadata(model, session): +def extended_metadata(session): instance = model.ExtendedMetadata(None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def extended_metadata_index(model, session, extended_metadata): +def extended_metadata_index(session, extended_metadata): instance = model.ExtendedMetadataIndex(extended_metadata, None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def form_definition(model, session, form_definition_current): +def form_definition(session, form_definition_current): instance = model.FormDefinition( name="a", form_definition_current=form_definition_current ) @@ -7017,104 +7006,103 @@ def form_definition(model, session, form_definition_current): @pytest.fixture -def form_definition_current(model, session): +def form_definition_current(session): instance = model.FormDefinitionCurrent() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def form_values(model, session): +def form_values(session): instance = model.FormValues() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def galaxy_session(model, session): +def galaxy_session(session): instance = model.GalaxySession(session_key=get_unique_value()) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def galaxy_session_history_association(model, session, galaxy_session, history): +def galaxy_session_history_association(session, galaxy_session, history): instance = model.GalaxySessionToHistoryAssociation(galaxy_session, history) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def group(model, session): +def group(session): instance = model.Group(name=get_unique_value()) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def group_quota_association(model, session): +def group_quota_association(session): instance = model.GroupQuotaAssociation(None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def group_role_association(model, session): +def group_role_association(session): instance = model.GroupRoleAssociation(None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history(model, session): +def history(session): instance = model.History() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_annotation_association(model, session): +def history_annotation_association(session): instance = model.HistoryAnnotationAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_dataset_annotation_association(model, session): +def history_dataset_annotation_association(session): instance = model.HistoryDatasetAnnotationAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_dataset_association(model, session, dataset): +def history_dataset_association(session, dataset): instance = model.HistoryDatasetAssociation(dataset=dataset) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_dataset_association_annotation_association(model, session): +def history_dataset_association_annotation_association(session): instance = model.HistoryDatasetAssociationAnnotationAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_dataset_association_rating_association(model, session): +def history_dataset_association_rating_association(session): instance = model.HistoryDatasetAssociationRatingAssociation(None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_dataset_association_tag_association(model, session): +def history_dataset_association_tag_association(session): instance = model.HistoryDatasetAssociationTagAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_dataset_collection_annotation_association(model, session): +def history_dataset_collection_annotation_association(session): instance = model.HistoryDatasetCollectionAssociationAnnotationAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_dataset_collection_association(model, session): +def history_dataset_collection_association(session): instance = model.HistoryDatasetCollectionAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture def history_dataset_collection_rating_association( - model, session, user, history_dataset_collection_association, @@ -7126,37 +7114,37 @@ def history_dataset_collection_rating_association( @pytest.fixture -def history_dataset_collection_tag_association(model, session): +def history_dataset_collection_tag_association(session): instance = model.HistoryDatasetCollectionTagAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_rating_association(model, session, user, history): +def history_rating_association(session, user, history): instance = model.HistoryRatingAssociation(user, history) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_tag_association(model, session): +def history_tag_association(session): instance = model.HistoryTagAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def history_user_share_association(model, session): +def history_user_share_association(session): instance = model.HistoryUserShareAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def implicit_collection_jobs(model, session): +def implicit_collection_jobs(session): instance = model.ImplicitCollectionJobs(populated_state="new") yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def implicit_collection_jobs_job_association(model, session): +def implicit_collection_jobs_job_association(session): instance = model.ImplicitCollectionJobsJobAssociation() instance.order_index = 1 yield from dbcleanup_wrapper(session, instance) @@ -7164,7 +7152,7 @@ def implicit_collection_jobs_job_association(model, session): @pytest.fixture def implicitly_converted_dataset_association( - model, session, history_dataset_association + session, history_dataset_association ): instance = model.ImplicitlyConvertedDatasetAssociation( dataset=history_dataset_association, @@ -7175,7 +7163,7 @@ def implicitly_converted_dataset_association( @pytest.fixture def implicitly_created_dataset_collection_input( - model, session, history_dataset_collection_association + session, history_dataset_collection_association ): instance = model.ImplicitlyCreatedDatasetCollectionInput( None, history_dataset_collection_association @@ -7184,62 +7172,62 @@ def implicitly_created_dataset_collection_input( @pytest.fixture -def interactive_tool_entry_point(model, session): +def interactive_tool_entry_point(session): instance = model.InteractiveToolEntryPoint() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def job(model, session): +def job(session): instance = model.Job() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def job_container_association(model, session): +def job_container_association(session): instance = model.JobContainerAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def job_export_history_archive(model, session): +def job_export_history_archive(session): instance = model.JobExportHistoryArchive() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def job_external_output_metadata(model, session, job, history_dataset_association): +def job_external_output_metadata(session, job, history_dataset_association): instance = model.JobExternalOutputMetadata(job, history_dataset_association) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def job_metric_numeric(model, session): +def job_metric_numeric(session): instance = model.JobMetricNumeric(None, None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def job_metric_text(model, session): +def job_metric_text(session): instance = model.JobMetricText(None, None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def job_parameter(model, session): +def job_parameter(session): instance = model.JobParameter(None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def job_state_history(model, session, job): +def job_state_history(session, job): instance = model.JobStateHistory(job) yield from dbcleanup_wrapper(session, instance) @pytest.fixture def job_to_implicit_output_dataset_collection_association( - model, session, dataset_collection + session, dataset_collection ): instance = model.JobToImplicitOutputDatasetCollectionAssociation( None, dataset_collection @@ -7248,14 +7236,14 @@ def job_to_implicit_output_dataset_collection_association( @pytest.fixture -def job_to_input_dataset_association(model, session, history_dataset_association): +def job_to_input_dataset_association(session, history_dataset_association): instance = model.JobToInputDatasetAssociation(None, history_dataset_association) yield from dbcleanup_wrapper(session, instance) @pytest.fixture def job_to_input_dataset_collection_association( - model, session, history_dataset_collection_association + session, history_dataset_collection_association ): instance = model.JobToInputDatasetCollectionAssociation( None, history_dataset_collection_association @@ -7265,7 +7253,7 @@ def job_to_input_dataset_collection_association( @pytest.fixture def job_to_input_dataset_collection_element_association( - model, session, dataset_collection_element + session, dataset_collection_element ): instance = model.JobToInputDatasetCollectionElementAssociation( None, dataset_collection_element @@ -7275,7 +7263,7 @@ def job_to_input_dataset_collection_element_association( @pytest.fixture def job_to_input_library_dataset_association( - model, session, library_dataset_dataset_association + session, library_dataset_dataset_association ): instance = model.JobToInputLibraryDatasetAssociation( None, library_dataset_dataset_association @@ -7284,14 +7272,14 @@ def job_to_input_library_dataset_association( @pytest.fixture -def job_to_output_dataset_association(model, session, history_dataset_association): +def job_to_output_dataset_association(session, history_dataset_association): instance = model.JobToOutputDatasetAssociation(None, history_dataset_association) yield from dbcleanup_wrapper(session, instance) @pytest.fixture def job_to_output_dataset_collection_association( - model, session, history_dataset_collection_association + session, history_dataset_collection_association ): instance = model.JobToOutputDatasetCollectionAssociation( None, history_dataset_collection_association @@ -7301,7 +7289,7 @@ def job_to_output_dataset_collection_association( @pytest.fixture def job_to_output_library_dataset_association( - model, session, library_dataset_dataset_association + session, library_dataset_dataset_association ): instance = model.JobToOutputLibraryDatasetAssociation( None, library_dataset_dataset_association @@ -7310,56 +7298,56 @@ def job_to_output_library_dataset_association( @pytest.fixture -def library(model, session): +def library(session): instance = model.Library() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_dataset(model, session): +def library_dataset(session): instance = model.LibraryDataset() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_dataset_annotation_association(model, session): +def library_dataset_annotation_association(session): instance = model.LibraryDatasetAnnotationAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_dataset_collection_annotation_association(model, session): +def library_dataset_collection_annotation_association(session): instance = model.LibraryDatasetCollectionAnnotationAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_dataset_collection_association(model, session): +def library_dataset_collection_association(session): instance = model.LibraryDatasetCollectionAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_dataset_collection_rating_association(model, session): +def library_dataset_collection_rating_association(session): instance = model.LibraryDatasetCollectionRatingAssociation(None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_dataset_collection_tag_association(model, session): +def library_dataset_collection_tag_association(session): instance = model.LibraryDatasetCollectionTagAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_dataset_dataset_association(model, session): +def library_dataset_dataset_association(session): instance = model.LibraryDatasetDatasetAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture def library_dataset_dataset_association_permission( - model, session, library_dataset_dataset_association, role + session, library_dataset_dataset_association, role ): instance = model.LibraryDatasetDatasetAssociationPermissions( "a", library_dataset_dataset_association, role @@ -7368,172 +7356,172 @@ def library_dataset_dataset_association_permission( @pytest.fixture -def library_dataset_dataset_association_tag_association(model, session): +def library_dataset_dataset_association_tag_association(session): instance = model.LibraryDatasetDatasetAssociationTagAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_dataset_permission(model, session, library_dataset, role): +def library_dataset_permission(session, library_dataset, role): instance = model.LibraryDatasetPermissions("a", library_dataset, role) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_folder(model, session): +def library_folder(session): instance = model.LibraryFolder() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_folder_permission(model, session, library_folder, role): +def library_folder_permission(session, library_folder, role): instance = model.LibraryFolderPermissions("a", library_folder, role) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def library_permission(model, session, library, role): +def library_permission(session, library, role): instance = model.LibraryPermissions("a", library, role) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def metadata_file(model, session): +def metadata_file(session): instance = model.MetadataFile() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def page(model, session, user): +def page(session, user): instance = model.Page() instance.user = user yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def page_annotation_association(model, session): +def page_annotation_association(session): instance = model.PageAnnotationAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def page_rating_association(model, session): +def page_rating_association(session): instance = model.PageRatingAssociation(None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def page_revision(model, session, page): +def page_revision(session, page): instance = model.PageRevision() instance.page = page yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def page_tag_association(model, session): +def page_tag_association(session): instance = model.PageTagAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def page_user_share_association(model, session): +def page_user_share_association(session): instance = model.PageUserShareAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def post_job_action(model, session): +def post_job_action(session): instance = model.PostJobAction("a") yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def post_job_action_association(model, session, post_job_action, job): +def post_job_action_association(session, post_job_action, job): instance = model.PostJobActionAssociation(post_job_action, job) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def quota(model, session): +def quota(session): instance = model.Quota(get_unique_value(), "b") yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def role(model, session): +def role(session): instance = model.Role(name=get_unique_value()) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def stored_workflow(model, session, user): +def stored_workflow(session, user): instance = model.StoredWorkflow() instance.user = user yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def stored_workflow_annotation_association(model, session): +def stored_workflow_annotation_association(session): instance = model.StoredWorkflowAnnotationAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def stored_workflow_rating_association(model, session): +def stored_workflow_rating_association(session): instance = model.StoredWorkflowRatingAssociation(None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def stored_workflow_tag_association(model, session): +def stored_workflow_tag_association(session): instance = model.StoredWorkflowTagAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def stored_workflow_user_share_association(model, session): +def stored_workflow_user_share_association(session): instance = model.StoredWorkflowUserShareAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def tag(model, session): +def tag(session): instance = model.Tag() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def task(model, session, job): +def task(session, job): instance = model.Task(job, "a", "b") yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def task_metric_numeric(model, session): +def task_metric_numeric(session): instance = model.TaskMetricNumeric("a", "b", 9) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def task_metric_text(model, session): +def task_metric_text(session): instance = model.TaskMetricText("a", "b", "c") yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def tool_tag_association(model, session): +def tool_tag_association(session): instance = model.ToolTagAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def user(model, session): +def user(session): instance = model.User(email=get_unique_value(), password="password") yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def user_address(model, session): +def user_address(session): instance = model.UserAddress() instance.name = "a" instance.address = "b" @@ -7545,105 +7533,105 @@ def user_address(model, session): @pytest.fixture -def user_authnz_token(model, session, user): +def user_authnz_token(session, user): instance = model.UserAuthnzToken("a", "b", "c", 1, "d", user) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def user_group_association(model, session): +def user_group_association(session): instance = model.UserGroupAssociation(None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def user_preference(model, session): +def user_preference(session): instance = model.UserPreference() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def user_quota_association(model, session): +def user_quota_association(session): instance = model.UserQuotaAssociation(None, None) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def user_role_association(model, session, user, role): +def user_role_association(session, user, role): instance = model.UserRoleAssociation(user, role) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def visualization(model, session, user): +def visualization(session, user): instance = model.Visualization() instance.user = user yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def visualization_annotation_association(model, session): +def visualization_annotation_association(session): instance = model.VisualizationAnnotationAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def visualization_rating_association(model, session, user, visualization): +def visualization_rating_association(session, user, visualization): instance = model.VisualizationRatingAssociation(user, visualization) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def visualization_revision(model, session, visualization): +def visualization_revision(session, visualization): instance = model.VisualizationRevision(visualization=visualization) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def visualization_tag_association(model, session): +def visualization_tag_association(session): instance = model.VisualizationTagAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def visualization_user_share_association(model, session): +def visualization_user_share_association(session): instance = model.VisualizationUserShareAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow(model, session): +def workflow(session): instance = model.Workflow() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_invocation(model, session, workflow): +def workflow_invocation(session, workflow): instance = model.WorkflowInvocation() instance.workflow = workflow yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_invocation_output_dataset_association(model, session): +def workflow_invocation_output_dataset_association(session): instance = model.WorkflowInvocationOutputDatasetAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_invocation_output_dataset_collection_association(model, session): +def workflow_invocation_output_dataset_collection_association(session): instance = model.WorkflowInvocationOutputDatasetCollectionAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_invocation_output_value(model, session): +def workflow_invocation_output_value(session): instance = model.WorkflowInvocationOutputValue() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_invocation_step(model, session, workflow_invocation, workflow_step): +def workflow_invocation_step(session, workflow_invocation, workflow_step): instance = model.WorkflowInvocationStep() instance.workflow_invocation = workflow_invocation instance.workflow_step = workflow_step @@ -7651,74 +7639,74 @@ def workflow_invocation_step(model, session, workflow_invocation, workflow_step) @pytest.fixture -def workflow_invocation_step_output_dataset_association(model, session): +def workflow_invocation_step_output_dataset_association(session): instance = model.WorkflowInvocationStepOutputDatasetAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_invocation_step_output_dataset_collection_association(model, session): +def workflow_invocation_step_output_dataset_collection_association(session): instance = model.WorkflowInvocationStepOutputDatasetCollectionAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_output(model, session, workflow_step): +def workflow_output(session, workflow_step): instance = model.WorkflowOutput(workflow_step) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_request_input_parameter(model, session): +def workflow_request_input_parameter(session): instance = model.WorkflowRequestInputParameter() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_request_input_step_parameter(model, session): +def workflow_request_input_step_parameter(session): instance = model.WorkflowRequestInputStepParameter() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_request_step_state(model, session): +def workflow_request_step_state(session): instance = model.WorkflowRequestStepState() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_request_to_input_dataset_association(model, session): +def workflow_request_to_input_dataset_association(session): instance = model.WorkflowRequestToInputDatasetAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_request_to_input_dataset_collection_association(model, session): +def workflow_request_to_input_dataset_collection_association(session): instance = model.WorkflowRequestToInputDatasetCollectionAssociation() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_step(model, session, workflow): +def workflow_step(session, workflow): instance = model.WorkflowStep() instance.workflow = workflow yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_step_connection(model, session): +def workflow_step_connection(session): instance = model.WorkflowStepConnection() yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_step_input(model, session, workflow_step): +def workflow_step_input(session, workflow_step): instance = model.WorkflowStepInput(workflow_step) yield from dbcleanup_wrapper(session, instance) @pytest.fixture -def workflow_step_tag_association(model, session): +def workflow_step_tag_association(session): instance = model.WorkflowStepTagAssociation() yield from dbcleanup_wrapper(session, instance) @@ -7730,9 +7718,8 @@ def workflow_step_tag_association(model, session): # how to construct the model it is testing, so instead of constructing an object directly, # a test calls a factory function, passed to it as a fixture. - @pytest.fixture -def dataset_collection_factory(model): +def dataset_collection_factory(): def make_instance(*args, **kwds): if "collection_type" not in kwds: kwds["collection_type"] = "a" @@ -7742,7 +7729,7 @@ def dataset_collection_factory(model): @pytest.fixture -def history_dataset_association_factory(model): +def history_dataset_association_factory(): def make_instance(*args, **kwds): return model.HistoryDatasetAssociation(*args, **kwds) @@ -7750,7 +7737,7 @@ def history_dataset_association_factory(model): @pytest.fixture -def history_dataset_collection_association_factory(model): +def history_dataset_collection_association_factory(): def make_instance(*args, **kwds): return model.HistoryDatasetCollectionAssociation(*args, **kwds) @@ -7758,7 +7745,7 @@ def history_dataset_collection_association_factory(model): @pytest.fixture -def history_factory(model): +def history_factory(): def make_instance(**kwds): instance = model.History() if "deleted" in kwds: @@ -7769,7 +7756,7 @@ def history_factory(model): @pytest.fixture -def history_rating_association_factory(model): +def history_rating_association_factory(): def make_instance(*args, **kwds): return model.HistoryRatingAssociation(*args, **kwds) @@ -7778,7 +7765,7 @@ def history_rating_association_factory(model): @pytest.fixture def implicitly_converted_dataset_association_factory( - model, history_dataset_association + history_dataset_association ): def make_instance(*args, **kwds): instance = model.ImplicitlyConvertedDatasetAssociation( @@ -7791,7 +7778,7 @@ def implicitly_converted_dataset_association_factory( @pytest.fixture -def library_dataset_dataset_association_factory(model): +def library_dataset_dataset_association_factory(): def make_instance(*args, **kwds): return model.LibraryDatasetDatasetAssociation(*args, **kwds) @@ -7799,7 +7786,7 @@ def library_dataset_dataset_association_factory(model): @pytest.fixture -def library_folder_factory(model): +def library_folder_factory(): def make_instance(*args, **kwds): return model.LibraryFolder(*args, **kwds) @@ -7807,7 +7794,7 @@ def library_folder_factory(model): @pytest.fixture -def page_rating_association_factory(model): +def page_rating_association_factory(): def make_instance(*args, **kwds): return model.PageRatingAssociation(*args, **kwds) @@ -7815,7 +7802,7 @@ def page_rating_association_factory(model): @pytest.fixture -def role_factory(model): +def role_factory(): def make_instance(*args, **kwds): return model.Role(*args, **kwds) @@ -7823,7 +7810,7 @@ def role_factory(model): @pytest.fixture -def stored_workflow_menu_entry_factory(model): +def stored_workflow_menu_entry_factory(): def make_instance(*args, **kwds): return model.StoredWorkflowMenuEntry(*args, **kwds) @@ -7831,7 +7818,7 @@ def stored_workflow_menu_entry_factory(model): @pytest.fixture -def stored_workflow_rating_association_factory(model): +def stored_workflow_rating_association_factory(): def make_instance(*args, **kwds): return model.StoredWorkflowRatingAssociation(*args, **kwds) @@ -7839,7 +7826,7 @@ def stored_workflow_rating_association_factory(model): @pytest.fixture -def stored_workflow_tag_association_factory(model): +def stored_workflow_tag_association_factory(): def make_instance(*args, **kwds): return model.StoredWorkflowTagAssociation(*args, **kwds) @@ -7847,7 +7834,7 @@ def stored_workflow_tag_association_factory(model): @pytest.fixture -def user_role_association_factory(model): +def user_role_association_factory(): def make_instance(*args, **kwds): return model.UserRoleAssociation(*args, **kwds) @@ -7855,7 +7842,7 @@ def user_role_association_factory(model): @pytest.fixture -def visualization_rating_association_factory(model): +def visualization_rating_association_factory(): def make_instance(*args, **kwds): return model.VisualizationRatingAssociation(*args, **kwds) @@ -7863,7 +7850,7 @@ def visualization_rating_association_factory(model): @pytest.fixture -def visualization_revision_factory(model, visualization): +def visualization_revision_factory(visualization): def make_instance(*args, **kwds): if "visualization" not in kwds: kwds["visualization"] = visualization @@ -7873,7 +7860,7 @@ def visualization_revision_factory(model, visualization): @pytest.fixture -def workflow_factory(model): +def workflow_factory(): def make_instance(*args, **kwds): return model.Workflow(*args, **kwds) @@ -7881,7 +7868,7 @@ def workflow_factory(model): @pytest.fixture -def workflow_invocation_factory(model, workflow): +def workflow_invocation_factory(workflow): def make_instance(**kwds): instance = model.WorkflowInvocation() instance.workflow = kwds.get("workflow", workflow) @@ -7891,7 +7878,7 @@ def workflow_invocation_factory(model, workflow): @pytest.fixture -def workflow_invocation_to_subworkflow_invocation_association_factory(model): +def workflow_invocation_to_subworkflow_invocation_association_factory(): def make_instance(*args, **kwds): return model.WorkflowInvocationToSubworkflowInvocationAssociation(*args, **kwds) @@ -7899,7 +7886,7 @@ def workflow_invocation_to_subworkflow_invocation_association_factory(model): @pytest.fixture -def workflow_step_connection_factory(model): +def workflow_step_connection_factory(): def make_instance(*args, **kwds): return model.WorkflowStepConnection(*args, **kwds) @@ -7907,7 +7894,7 @@ def workflow_step_connection_factory(model): @pytest.fixture -def workflow_step_factory(model, workflow): +def workflow_step_factory(workflow): def make_instance(*args, **kwds): instance = model.WorkflowStep() instance.workflow = kwds.get("workflow", workflow)