diff --git a/allensdk/test/brain_observatory/behavior/conftest.py b/allensdk/test/brain_observatory/behavior/conftest.py index 83723c6e0..5941b1e4f 100644 --- a/allensdk/test/brain_observatory/behavior/conftest.py +++ b/allensdk/test/brain_observatory/behavior/conftest.py @@ -127,6 +127,5 @@ def behavior_ophys_experiment_fixture(): experiment_id = 953443028 experiment = BehaviorOphysExperiment.from_lims( - experiment_id, - load_stimulus_movie=False) + experiment_id) return experiment diff --git a/allensdk/test/brain_observatory/behavior/test_behavior_ophys_experiment.py b/allensdk/test/brain_observatory/behavior/test_behavior_ophys_experiment.py index 48028d718..779a6413a 100644 --- a/allensdk/test/brain_observatory/behavior/test_behavior_ophys_experiment.py +++ b/allensdk/test/brain_observatory/behavior/test_behavior_ophys_experiment.py @@ -33,7 +33,6 @@ def test_nwb_end_to_end(tmpdir_factory): d1 = BehaviorOphysExperiment.from_lims( oeid, - load_stimulus_movie=False ) nwbfile = d1.to_nwb() with NWBHDF5IO(nwb_filepath, "w") as nwb_file_writer: @@ -52,7 +51,6 @@ def test_visbeh_ophys_data_set(): data_set = BehaviorOphysExperiment.from_lims( ophys_experiment_id, exclude_invalid_rois=False, - load_stimulus_movie=False ) # TODO: need to improve testing here: @@ -68,7 +66,6 @@ def test_visbeh_ophys_data_set(): behavior_session_id = BehaviorSessionId.from_lims( db=lims_db, ophys_experiment_id=ophys_experiment_id, - load_stimulus_movie=False ) # All sorts of assert relationships: @@ -76,7 +73,6 @@ def test_visbeh_ophys_data_set(): ForagingId.from_lims( behavior_session_id=behavior_session_id.value, lims_db=lims_db, - load_stimulus_movie=False ).value == data_set.metadata["behavior_session_uuid"] ) @@ -167,7 +163,6 @@ def test_legacy_dff_api(): ophys_experiment_id = 792813858 session = BehaviorOphysExperiment.from_lims( ophys_experiment_id=ophys_experiment_id, - load_stimulus_movie=False ) _, dff_array = session.get_dff_traces() @@ -187,7 +182,6 @@ def test_legacy_dff_api(): def test_stimulus_presentations_omitted(ophys_experiment_id, number_omitted): session = BehaviorOphysExperiment.from_lims( ophys_experiment_id, - load_stimulus_movie=False ) df = session.stimulus_presentations assert df["omitted"].sum() == number_omitted @@ -198,7 +192,6 @@ def test_event_detection(): ophys_experiment_id = 789359614 session = BehaviorOphysExperiment.from_lims( ophys_experiment_id=ophys_experiment_id, - load_stimulus_movie=False ) events = session.events @@ -229,7 +222,6 @@ def test_BehaviorOphysExperiment_property_data(): ophys_experiment_id = 960410026 dataset = BehaviorOphysExperiment.from_lims( ophys_experiment_id, - load_stimulus_movie=False ) assert dataset.ophys_session_id == 959458018 diff --git a/allensdk/test/brain_observatory/behavior/test_behavior_session.py b/allensdk/test/brain_observatory/behavior/test_behavior_session.py index 984440805..66b50172c 100644 --- a/allensdk/test/brain_observatory/behavior/test_behavior_session.py +++ b/allensdk/test/brain_observatory/behavior/test_behavior_session.py @@ -20,8 +20,7 @@ def test_nwb_end_to_end_session( tmpdir = pathlib.Path(tmpdir) nwb_path = tmpdir / f'session_{session_id}.nwb' session = BehaviorSession.from_lims( - behavior_session_id=session_id, - load_stimulus_movie=False) + behavior_session_id=session_id) nwb_file = session.to_nwb() with NWBHDF5IO(nwb_path, 'w') as nwb_file_writer: nwb_file_writer.write(nwb_file) @@ -105,8 +104,7 @@ def test_behavior_session_equivalent_json_lims(session_data_fixture): behavior_session_id = session_data_fixture['behavior_session_id'] lims_session = BehaviorSession.from_lims( - behavior_session_id, - load_stimulus_movie=False + behavior_session_id ) assert sessions_are_equal(json_session, lims_session, reraise=True) @@ -119,6 +117,5 @@ def test_eye_tracking_loaded_with_metadata_frame(self): sess_id = 1154034257 sess = BehaviorSession.from_lims(behavior_session_id=sess_id, - lims_db=self.dbconn, - load_stimulus_movie=False) + lims_db=self.dbconn) assert not sess.eye_tracking.empty diff --git a/allensdk/test/brain_observatory/behavior/test_incomplete_data_objects.py b/allensdk/test/brain_observatory/behavior/test_incomplete_data_objects.py index df482be7b..c32a115a5 100644 --- a/allensdk/test/brain_observatory/behavior/test_incomplete_data_objects.py +++ b/allensdk/test/brain_observatory/behavior/test_incomplete_data_objects.py @@ -54,8 +54,7 @@ def test_incomplete_eye_tracking_from_lims( incomplete_exp_id = 806456687 incomplete_experiment = BehaviorOphysExperiment.from_lims( - incomplete_exp_id, - load_stimulus_movie=False) + incomplete_exp_id) complete = behavior_ophys_experiment_fixture.eye_tracking incomplete = incomplete_experiment.eye_tracking