diff --git a/robot-server/tests/integration/http_api/protocols/test_v6_json_upload.tavern.yaml b/robot-server/tests/integration/http_api/protocols/test_v6_json_upload.tavern.yaml index 4cfc73a359c..9f8d37c5742 100644 --- a/robot-server/tests/integration/http_api/protocols/test_v6_json_upload.tavern.yaml +++ b/robot-server/tests/integration/http_api/protocols/test_v6_json_upload.tavern.yaml @@ -98,6 +98,7 @@ stages: location: slotName: '12' offsetId: null + displayName: null - id: sourcePlateId loadName: foo_8_plate_33ul definitionUri: example/foo_8_plate_33ul/1 diff --git a/robot-server/tests/integration/http_api/protocols/test_v8_json_upload_flex.tavern.yaml b/robot-server/tests/integration/http_api/protocols/test_v8_json_upload_flex.tavern.yaml index 636cd055090..84e2b2794cf 100644 --- a/robot-server/tests/integration/http_api/protocols/test_v8_json_upload_flex.tavern.yaml +++ b/robot-server/tests/integration/http_api/protocols/test_v8_json_upload_flex.tavern.yaml @@ -66,6 +66,7 @@ stages: author: engineering protocolName: Simple test protocol analyses: [] + key: null analysisSummaries: - id: '{analysis_id}' status: completed @@ -97,24 +98,28 @@ stages: displayName: Source Plate location: moduleId: temperatureModuleId + offsetId: null - id: destPlateId loadName: armadillo_96_wellplate_200ul_pcr_full_skirt definitionUri: opentrons/armadillo_96_wellplate_200ul_pcr_full_skirt/1 displayName: Sample Collection Plate location: moduleId: magneticModuleId + offsetId: null - id: tipRackId loadName: opentrons_96_tiprack_1000ul definitionUri: opentrons/opentrons_96_tiprack_1000ul/1 displayName: Opentrons 96 Tip Rack 1000 µL location: slotName: 'B2' + offsetId: null - id: fixedTrash loadName: opentrons_1_trash_1100ml_fixed definitionUri: opentrons/opentrons_1_trash_1100ml_fixed/1 displayName: Trash location: slotName: 'A3' + offsetId: null modules: - id: magneticModuleId serialNumber: !anystr @@ -133,10 +138,14 @@ stages: commandType: home key: !anystr status: succeeded - params: { } + params: + skipIfMountPositionOk: null + axes: null result: { } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadPipette @@ -150,6 +159,8 @@ stages: pipetteId: pipetteId startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadModule @@ -167,6 +178,8 @@ stages: serialNumber: !anystr startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadModule @@ -184,6 +197,8 @@ stages: serialNumber: !anystr startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadLabware @@ -200,8 +215,11 @@ stages: result: labwareId: sourcePlateId definition: !anydict + offsetId: null startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadLabware @@ -218,8 +236,11 @@ stages: result: labwareId: destPlateId definition: !anydict + offsetId: null startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadLabware @@ -236,8 +257,11 @@ stages: result: labwareId: tipRackId definition: !anydict + offsetId: null startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadLabware @@ -254,8 +278,11 @@ stages: result: labwareId: fixedTrash definition: !anydict + offsetId: null startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadLiquid @@ -270,15 +297,21 @@ stages: result: {} startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: home key: !anystr status: succeeded - params: {} + params: + skipIfMountPositionOk: null + axes: null result: {} startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: pickUpTip @@ -301,6 +334,8 @@ stages: tipDiameter: 7.23 startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: aspirate @@ -323,6 +358,8 @@ stages: volume: 5.0 startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: waitForDuration @@ -330,9 +367,12 @@ stages: status: succeeded params: seconds: 42.0 + message: null result: {} startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: dispense @@ -350,11 +390,14 @@ stages: z: 1.0 volume: 4.5 flowRate: 2.5 + pushOut: null result: position: { 'x': 341.205, 'y': 65.115, 'z': 84.3 } volume: 4.5 startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: touchTip @@ -376,6 +419,8 @@ stages: position: { 'x': 341.205, 'y': 65.115, 'z': 94.3 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: blowout @@ -396,6 +441,8 @@ stages: position: { 'x': 341.205, 'y': 65.115, 'z': 95.3 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveToCoordinates @@ -408,10 +455,14 @@ stages: y: 100.0 z: 100.0 forceDirect: false + minimumZHeight: null + speed: null result: position: { 'x': 100.0, 'y': 100.0, 'z': 100.0 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveToWell @@ -429,11 +480,14 @@ stages: z: 0 forceDirect: false speed: 12.3 + minimumZHeight: null result: position: { 'x': 350.205, 'y': 65.115, 'z': 98.25 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveToWell @@ -451,11 +505,14 @@ stages: z: 10.0 minimumZHeight: 35.0 forceDirect: true + speed: null result: position: { 'x': 352.205, 'y': 68.115, 'z': 93.3 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: dropTip @@ -472,10 +529,13 @@ stages: y: 0 z: 0 alternateDropLocation: false + homeAfter: null result: position: { 'x': 410.84000000000003, 'y': 374.56, 'z': 82.0 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: waitForResume @@ -486,6 +546,8 @@ stages: result: {} startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveToCoordinates @@ -499,10 +561,13 @@ stages: z: 0.0 minimumZHeight: 35.0 forceDirect: true + speed: null result: position: { 'x': 0.0, 'y': 0.0, 'z': 0.0 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveRelative @@ -519,6 +584,8 @@ stages: z: !anyfloat startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveRelative @@ -535,6 +602,8 @@ stages: z: !anyfloat startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: savePosition @@ -543,6 +612,7 @@ stages: params: pipetteId: pipetteId failOnNotHomed: true + positionId: null result: positionId: !anystr position: @@ -551,6 +621,8 @@ stages: z: !anyfloat startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveRelative @@ -567,6 +639,8 @@ stages: z: !anyfloat startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: savePosition @@ -584,6 +658,8 @@ stages: z: !anyfloat startedAt: !anystr completedAt: !anystr + error: null + intent: null errors: [] liquids: - id: waterId diff --git a/robot-server/tests/integration/http_api/protocols/test_v8_json_upload_ot2.tavern.yaml b/robot-server/tests/integration/http_api/protocols/test_v8_json_upload_ot2.tavern.yaml index 48fb8200d61..6e0f018af08 100644 --- a/robot-server/tests/integration/http_api/protocols/test_v8_json_upload_ot2.tavern.yaml +++ b/robot-server/tests/integration/http_api/protocols/test_v8_json_upload_ot2.tavern.yaml @@ -65,6 +65,7 @@ stages: author: engineering protocolName: Simple test protocol analyses: [] + key: null analysisSummaries: - id: '{analysis_id}' status: completed @@ -96,24 +97,28 @@ stages: displayName: Source Plate location: moduleId: temperatureModuleId + offsetId: null - id: destPlateId loadName: armadillo_96_wellplate_200ul_pcr_full_skirt definitionUri: opentrons/armadillo_96_wellplate_200ul_pcr_full_skirt/1 displayName: Sample Collection Plate location: moduleId: magneticModuleId + offsetId: null - id: tipRackId loadName: opentrons_96_tiprack_10ul definitionUri: opentrons/opentrons_96_tiprack_10ul/1 displayName: Opentrons 96 Tip Rack 10 µL location: slotName: '8' + offsetId: null - id: fixedTrash loadName: opentrons_1_trash_1100ml_fixed definitionUri: opentrons/opentrons_1_trash_1100ml_fixed/1 displayName: Trash location: slotName: '12' + offsetId: null modules: - id: magneticModuleId serialNumber: !anystr @@ -132,10 +137,14 @@ stages: commandType: home key: !anystr status: succeeded - params: { } + params: + skipIfMountPositionOk: null + axes: null result: { } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadPipette @@ -149,6 +158,8 @@ stages: pipetteId: pipetteId startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadModule @@ -166,6 +177,8 @@ stages: serialNumber: !anystr startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadModule @@ -183,6 +196,8 @@ stages: serialNumber: !anystr startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadLabware @@ -199,8 +214,11 @@ stages: result: labwareId: sourcePlateId definition: !anydict + offsetId: null startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadLabware @@ -217,8 +235,11 @@ stages: result: labwareId: destPlateId definition: !anydict + offsetId: null startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadLabware @@ -235,8 +256,11 @@ stages: result: labwareId: tipRackId definition: !anydict + offsetId: null startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadLabware @@ -253,8 +277,11 @@ stages: result: labwareId: fixedTrash definition: !anydict + offsetId: null startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: loadLiquid @@ -269,15 +296,21 @@ stages: result: {} startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: home key: !anystr status: succeeded - params: {} + params: + skipIfMountPositionOk: null + axes: null result: {} startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: pickUpTip @@ -300,6 +333,8 @@ stages: tipDiameter: 3.27 startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: aspirate @@ -322,6 +357,8 @@ stages: volume: 5.0 startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: waitForDuration @@ -329,9 +366,12 @@ stages: status: succeeded params: seconds: 42.0 + message: null result: {} startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: dispense @@ -349,11 +389,14 @@ stages: z: 1.0 volume: 4.5 flowRate: 2.5 + pushOut: null result: position: { 'x': 280.805, 'y': 65.115, 'z': 84.3 } volume: 4.5 startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: touchTip @@ -370,10 +413,13 @@ stages: y: 0.0 z: 11.0 radius: 1.0 + speed: null result: position: { 'x': 280.805, 'y': 65.115, 'z': 94.3 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: blowout @@ -394,6 +440,8 @@ stages: position: { 'x': 280.805, 'y': 65.115, 'z': 95.3 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveToCoordinates @@ -406,10 +454,14 @@ stages: y: 100.0 z: 100.0 forceDirect: false + minimumZHeight: null + speed: null result: position: {'x': 100.0, 'y': 100.0, 'z': 100.0} startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveToWell @@ -426,11 +478,15 @@ stages: y: 0 z: 0 forceDirect: false + speed: null + minimumZHeight: null result: position: { 'x': 289.805, 'y': 65.115, 'z': 98.25 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveToWell @@ -448,11 +504,14 @@ stages: z: 10.0 minimumZHeight: 35.0 forceDirect: true + speed: null result: position: { 'x': 291.805, 'y': 68.115, 'z': 93.3 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: dropTip @@ -469,10 +528,13 @@ stages: y: 0 z: 0 alternateDropLocation: false + homeAfter: null result: position: { 'x': 347.84000000000003, 'y': 325.06, 'z': 82.0 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: waitForResume @@ -483,6 +545,8 @@ stages: result: {} startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveToCoordinates @@ -496,10 +560,13 @@ stages: z: 0.0 minimumZHeight: 35.0 forceDirect: true + speed: null result: position: { 'x': 0.0, 'y': 0.0, 'z': 0.0 } startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveRelative @@ -516,6 +583,8 @@ stages: z: !anyfloat startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveRelative @@ -532,6 +601,8 @@ stages: z: !anyfloat startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: savePosition @@ -540,6 +611,7 @@ stages: params: pipetteId: pipetteId failOnNotHomed: true + positionId: null result: positionId: !anystr position: @@ -548,6 +620,8 @@ stages: z: !anyfloat startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: moveRelative @@ -564,6 +638,8 @@ stages: z: !anyfloat startedAt: !anystr completedAt: !anystr + error: null + intent: null - id: !anystr createdAt: !anystr commandType: savePosition @@ -581,6 +657,8 @@ stages: z: !anyfloat startedAt: !anystr completedAt: !anystr + error: null + intent: null errors: [] liquids: - id: waterId diff --git a/robot-server/tests/integration/http_api/runs/test_maintenance_run_creation.tavern.yaml b/robot-server/tests/integration/http_api/runs/test_maintenance_run_creation.tavern.yaml index 7b7d7930f22..23be48f9fb0 100644 --- a/robot-server/tests/integration/http_api/runs/test_maintenance_run_creation.tavern.yaml +++ b/robot-server/tests/integration/http_api/runs/test_maintenance_run_creation.tavern.yaml @@ -12,7 +12,8 @@ stages: response: json: data: [] - links: {} + links: + current: null meta: cursor: 0 totalLength: 0 diff --git a/robot-server/tests/integration/http_api/test_deck_configuration.tavern.yaml b/robot-server/tests/integration/http_api/test_deck_configuration.tavern.yaml index 21be55b752f..63b3f27fdfd 100644 --- a/robot-server/tests/integration/http_api/test_deck_configuration.tavern.yaml +++ b/robot-server/tests/integration/http_api/test_deck_configuration.tavern.yaml @@ -5,6 +5,17 @@ marks: - usefixtures: - ot3_server_base_url +# lastModifiedAt is deliberately omitted from this expected object. +# This requires turning off strict json checking. +# A lastModifiedAt that's omitted or null means the deck configuration has never been set. +# +# Unfortunately, this makes this test order-dependent with any other tests +# that modify the deck configuration, even if they try to restore the original value +# after they're done. We probably need some kind of deck configuration factory-reset. +strict: + - headers:off + - json:off + stages: - name: Get the deck configuration and make sure there's a default request: @@ -12,14 +23,7 @@ stages: response: json: data: - # lastModifiedAt is deliberately omitted from this expected object. - # A lastModifiedAt that's omitted or null means the deck configuration has never been set. - # - # Unfortunately, this makes this test order-dependent with any other tests - # that modify the deck configuration, even if they try to restore the original value - # after they're done. We probably need some kind of deck configuration factory-reset. - # - # lastModifiedAt: null + cutoutFixtures: &expectedDefaultCutoutFixtures - cutoutFixtureId: singleLeftSlot cutoutId: cutoutA1 diff --git a/robot-server/tests/protocols/test_completed_analysis_store.py b/robot-server/tests/protocols/test_completed_analysis_store.py index 4b76386acd4..fe1845e444c 100644 --- a/robot-server/tests/protocols/test_completed_analysis_store.py +++ b/robot-server/tests/protocols/test_completed_analysis_store.py @@ -159,6 +159,7 @@ async def test_get_by_analysis_id_as_document( "id": "analysis-id", "result": "ok", "status": "completed", + "robotType": None, "commands": [], "errors": [], "labware": [],