From 3933a848e4e2f069908f9a79783d91f0fa274472 Mon Sep 17 00:00:00 2001 From: Josh McVey Date: Fri, 15 Dec 2023 18:04:07 -0600 Subject: [PATCH] fix(app-testing): more sorting --- app-testing/conftest.py | 3 +-- ...MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment].json | 8 ++++---- ...TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4].json | 8 ++++---- ...S_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x].json | 8 ++++---- ..._None_2_15_ABR_Simple_Normalize_Long_Right].json | 8 ++++---- ...15_ABR5_6_HDQ_Bacteria_ParkTips_96_channel].json | 8 ++++---- ..._P1000_96_HS_TM_MM_2_15_MagMaxRNACells96Ch].json | 8 ++++---- ...ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III].json | 8 ++++---- ...ABR5_6_IDT_xGen_EZ_96x_Head_PART_I_III_ABR].json | 8 ++++---- ...P100_96_HS_TM_2_15_Quick_Zymo_RNA_Bacteria].json | 8 ++++---- ...MRight_None_2_15_ABRKAPALibraryQuantLongv2].json | 8 ++++---- ...2_12_Python310SyntaxRobotAnalysisOnlyError].json | 8 ++++---- ...rror][OT2_None_None_2_13_PythonSyntaxError].json | 8 ++++---- ...er][OT2_P1000SLeft_None_6_1_SimpleTransfer].json | 8 ++++---- ...Swift][OT2_P10S_P300M_TC1_TM_MM_2_11_Swift].json | 8 ++++---- ...OT2_P20SRight_None_6_1_SimpleTransferError].json | 8 ++++---- ...Walkthrough][OT2_P20S_None_2_7_Walkthrough].json | 8 ++++---- ...2_P20S_P300M_HS_6_1_HS_WithCollision_Error].json | 8 ++++---- ..._P300M_NoMods_6_1_TransferReTransferLiquid].json | 8 ++++---- ..._TM_2_4_Zymo][OT2_P300MLeft_MM_TM_2_4_Zymo].json | 8 ++++---- ...ase][OT2_P300M_P20S_HS_6_1_Smoke620release].json | 8 ++++---- ...2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error].json | 8 ++++---- ...][OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error].json | 8 ++++---- ..._PD40][OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40].json | 8 ++++---- ...300M_P20S_NoMod_6_1_MixTransferManyLiquids].json | 8 ++++---- ...lOnRun][OT2_P300M_P20S_None_2_12_FailOnRun].json | 8 ++++---- ...][OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3].json | 8 ++++---- ...][OT2_P300M_P20S_TC_HS_TM_2_14_SmokeTestV3].json | 8 ++++---- ...][OT2_P300M_P20S_TC_HS_TM_2_15_SmokeTestV3].json | 8 ++++---- ...2_P300M_P20S_TC_MM_TM_2_13_Smoke620Release].json | 8 ++++---- ...300M_P300S_HS_6_1_HS_NormalUseWithTransfer].json | 8 ++++---- ...][OT2_P300SG1_None_5_2_6_Gen1PipetteSimple].json | 8 ++++---- ...00SLeft_MM1_MM_2_2_EngageMagHeightFromBase].json | 8 ++++---- ...M_2_3_Mix][OT2_P300SLeft_MM1_MM_TM_2_3_Mix].json | 8 ++++---- ...ps][OT2_P300SLeft_MM_TM_TM_5_2_6_MOAMTemps].json | 8 ++++---- ...m_Error][OT2_P300S_Thermocycler_Moam_Error].json | 8 ++++---- ...S_Twinning_Error][OT2_P300S_Twinning_Error].json | 8 ++++---- app-testing/tests/analyses_snapshot_test.py | 13 ++++++++----- 38 files changed, 153 insertions(+), 151 deletions(-) diff --git a/app-testing/conftest.py b/app-testing/conftest.py index 6e614c2eb88..1c2762fffd4 100644 --- a/app-testing/conftest.py +++ b/app-testing/conftest.py @@ -24,13 +24,12 @@ # This is important for CI if find_dotenv(): load_dotenv(find_dotenv(), override=False) -elif find_dotenv(filename="example.env"): # example.env has our defaults +elif find_dotenv(filename="example.env"): # example.env has our defaults load_dotenv(find_dotenv(filename="example.env"), override=False) else: raise AssertionError("No .env or example.env file found.") - def pytest_collection_modifyitems(items): # type: ignore # noqa: ANN201,ANN001 """Order tests.""" # When running all tests calibrate the robot first. diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment][Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment][Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment].json index 3c60e1cbc51..a3b5740375d 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment][Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment][Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment].json @@ -9971,11 +9971,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -9983,11 +9983,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4][Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4][Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4].json index 5449a0f221b..f8b24d3d317 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4][Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4][Flex_P1000MLeft_P50MRight_HS_MM_TC_TM_2_15_ABR3_Illumina_DNA_Enrichment_v4].json @@ -11818,11 +11818,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -11830,11 +11830,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x][Flex_P1000MLeft_P50MRight_HS_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x][Flex_P1000MLeft_P50MRight_HS_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x].json index 0b76f6f2b58..f575249ecc9 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x][Flex_P1000MLeft_P50MRight_HS_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000MLeft_P50MRight_HS_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x][Flex_P1000MLeft_P50MRight_HS_TM_MM_TC_2_15_ABR4_Illumina_DNA_Prep_24x].json @@ -28270,11 +28270,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -28282,11 +28282,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000SRight_None_2_15_ABR_Simple_Normalize_Long_Right][Flex_P1000SRight_None_2_15_ABR_Simple_Normalize_Long_Right].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000SRight_None_2_15_ABR_Simple_Normalize_Long_Right][Flex_P1000SRight_None_2_15_ABR_Simple_Normalize_Long_Right].json index cee4cb549e5..85a635a8d6d 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000SRight_None_2_15_ABR_Simple_Normalize_Long_Right][Flex_P1000SRight_None_2_15_ABR_Simple_Normalize_Long_Right].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000SRight_None_2_15_ABR_Simple_Normalize_Long_Right][Flex_P1000SRight_None_2_15_ABR_Simple_Normalize_Long_Right].json @@ -95666,11 +95666,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -95678,11 +95678,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_MM_2_15_ABR5_6_HDQ_Bacteria_ParkTips_96_channel][Flex_P1000_96_HS_TM_MM_2_15_ABR5_6_HDQ_Bacteria_ParkTips_96_channel].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_MM_2_15_ABR5_6_HDQ_Bacteria_ParkTips_96_channel][Flex_P1000_96_HS_TM_MM_2_15_ABR5_6_HDQ_Bacteria_ParkTips_96_channel].json index 4d7579be225..c62fc98ffeb 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_MM_2_15_ABR5_6_HDQ_Bacteria_ParkTips_96_channel][Flex_P1000_96_HS_TM_MM_2_15_ABR5_6_HDQ_Bacteria_ParkTips_96_channel].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_MM_2_15_ABR5_6_HDQ_Bacteria_ParkTips_96_channel][Flex_P1000_96_HS_TM_MM_2_15_ABR5_6_HDQ_Bacteria_ParkTips_96_channel].json @@ -13269,11 +13269,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -13281,11 +13281,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_MM_2_15_MagMaxRNACells96Ch][Flex_P1000_96_HS_TM_MM_2_15_MagMaxRNACells96Ch].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_MM_2_15_MagMaxRNACells96Ch][Flex_P1000_96_HS_TM_MM_2_15_MagMaxRNACells96Ch].json index bc1f3200fac..b92c32829cb 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_MM_2_15_MagMaxRNACells96Ch][Flex_P1000_96_HS_TM_MM_2_15_MagMaxRNACells96Ch].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_MM_2_15_MagMaxRNACells96Ch][Flex_P1000_96_HS_TM_MM_2_15_MagMaxRNACells96Ch].json @@ -13067,11 +13067,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -13079,11 +13079,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_TC_MM_2_15_ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III][Flex_P1000_96_HS_TM_TC_MM_2_15_ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_TC_MM_2_15_ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III][Flex_P1000_96_HS_TM_TC_MM_2_15_ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III].json index 1d220d916a1..13865d42f90 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_TC_MM_2_15_ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III][Flex_P1000_96_HS_TM_TC_MM_2_15_ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_HS_TM_TC_MM_2_15_ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III][Flex_P1000_96_HS_TM_TC_MM_2_15_ABR5_6_Illumina_DNA_Prep_96x_Head_PART_III].json @@ -5712,11 +5712,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -5724,11 +5724,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_None_2_15_ABR5_6_IDT_xGen_EZ_96x_Head_PART_I_III_ABR][Flex_P1000_96_None_2_15_ABR5_6_IDT_xGen_EZ_96x_Head_PART_I_III_ABR].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_None_2_15_ABR5_6_IDT_xGen_EZ_96x_Head_PART_I_III_ABR][Flex_P1000_96_None_2_15_ABR5_6_IDT_xGen_EZ_96x_Head_PART_I_III_ABR].json index dcbdb404b09..527e98299ba 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_None_2_15_ABR5_6_IDT_xGen_EZ_96x_Head_PART_I_III_ABR][Flex_P1000_96_None_2_15_ABR5_6_IDT_xGen_EZ_96x_Head_PART_I_III_ABR].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P1000_96_None_2_15_ABR5_6_IDT_xGen_EZ_96x_Head_PART_I_III_ABR][Flex_P1000_96_None_2_15_ABR5_6_IDT_xGen_EZ_96x_Head_PART_I_III_ABR].json @@ -11017,11 +11017,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -11029,11 +11029,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P100_96_HS_TM_2_15_Quick_Zymo_RNA_Bacteria][Flex_P100_96_HS_TM_2_15_Quick_Zymo_RNA_Bacteria].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P100_96_HS_TM_2_15_Quick_Zymo_RNA_Bacteria][Flex_P100_96_HS_TM_2_15_Quick_Zymo_RNA_Bacteria].json index 60d2530b6a9..5f5fba073b7 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P100_96_HS_TM_2_15_Quick_Zymo_RNA_Bacteria][Flex_P100_96_HS_TM_2_15_Quick_Zymo_RNA_Bacteria].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P100_96_HS_TM_2_15_Quick_Zymo_RNA_Bacteria][Flex_P100_96_HS_TM_2_15_Quick_Zymo_RNA_Bacteria].json @@ -13148,11 +13148,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -13160,11 +13160,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P50MLeft_P1000MRight_None_2_15_ABRKAPALibraryQuantLongv2][Flex_P50MLeft_P1000MRight_None_2_15_ABRKAPALibraryQuantLongv2].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P50MLeft_P1000MRight_None_2_15_ABRKAPALibraryQuantLongv2][Flex_P50MLeft_P1000MRight_None_2_15_ABRKAPALibraryQuantLongv2].json index 99363870473..bba17d746ee 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P50MLeft_P1000MRight_None_2_15_ABRKAPALibraryQuantLongv2][Flex_P50MLeft_P1000MRight_None_2_15_ABRKAPALibraryQuantLongv2].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[Flex_P50MLeft_P1000MRight_None_2_15_ABRKAPALibraryQuantLongv2][Flex_P50MLeft_P1000MRight_None_2_15_ABRKAPALibraryQuantLongv2].json @@ -140640,11 +140640,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -140652,11 +140652,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_None_None_2_12_Python310SyntaxRobotAnalysisOnlyError][OT2_None_None_2_12_Python310SyntaxRobotAnalysisOnlyError].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_None_None_2_12_Python310SyntaxRobotAnalysisOnlyError][OT2_None_None_2_12_Python310SyntaxRobotAnalysisOnlyError].json index 0a5e533074c..dfb4ce4eeea 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_None_None_2_12_Python310SyntaxRobotAnalysisOnlyError][OT2_None_None_2_12_Python310SyntaxRobotAnalysisOnlyError].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_None_None_2_12_Python310SyntaxRobotAnalysisOnlyError][OT2_None_None_2_12_Python310SyntaxRobotAnalysisOnlyError].json @@ -57,11 +57,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -69,11 +69,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_None_None_2_13_PythonSyntaxError][OT2_None_None_2_13_PythonSyntaxError].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_None_None_2_13_PythonSyntaxError][OT2_None_None_2_13_PythonSyntaxError].json index be21c25c651..14d0e86d33f 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_None_None_2_13_PythonSyntaxError][OT2_None_None_2_13_PythonSyntaxError].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_None_None_2_13_PythonSyntaxError][OT2_None_None_2_13_PythonSyntaxError].json @@ -44,11 +44,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -56,11 +56,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P1000SLeft_None_6_1_SimpleTransfer][OT2_P1000SLeft_None_6_1_SimpleTransfer].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P1000SLeft_None_6_1_SimpleTransfer][OT2_P1000SLeft_None_6_1_SimpleTransfer].json index f9a45bc9aab..8e5e354275c 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P1000SLeft_None_6_1_SimpleTransfer][OT2_P1000SLeft_None_6_1_SimpleTransfer].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P1000SLeft_None_6_1_SimpleTransfer][OT2_P1000SLeft_None_6_1_SimpleTransfer].json @@ -1815,11 +1815,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -1827,11 +1827,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P10S_P300M_TC1_TM_MM_2_11_Swift][OT2_P10S_P300M_TC1_TM_MM_2_11_Swift].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P10S_P300M_TC1_TM_MM_2_11_Swift][OT2_P10S_P300M_TC1_TM_MM_2_11_Swift].json index c6b67eeec6c..c23effc8a2a 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P10S_P300M_TC1_TM_MM_2_11_Swift][OT2_P10S_P300M_TC1_TM_MM_2_11_Swift].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P10S_P300M_TC1_TM_MM_2_11_Swift][OT2_P10S_P300M_TC1_TM_MM_2_11_Swift].json @@ -13845,11 +13845,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -13857,11 +13857,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20SRight_None_6_1_SimpleTransferError][OT2_P20SRight_None_6_1_SimpleTransferError].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20SRight_None_6_1_SimpleTransferError][OT2_P20SRight_None_6_1_SimpleTransferError].json index c632659a962..eb988443985 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20SRight_None_6_1_SimpleTransferError][OT2_P20SRight_None_6_1_SimpleTransferError].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20SRight_None_6_1_SimpleTransferError][OT2_P20SRight_None_6_1_SimpleTransferError].json @@ -1757,11 +1757,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -1769,11 +1769,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_None_2_7_Walkthrough][OT2_P20S_None_2_7_Walkthrough].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_None_2_7_Walkthrough][OT2_P20S_None_2_7_Walkthrough].json index 33839affa4c..8400c75fe71 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_None_2_7_Walkthrough][OT2_P20S_None_2_7_Walkthrough].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_None_2_7_Walkthrough][OT2_P20S_None_2_7_Walkthrough].json @@ -4221,11 +4221,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -4233,11 +4233,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_P300M_HS_6_1_HS_WithCollision_Error][OT2_P20S_P300M_HS_6_1_HS_WithCollision_Error].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_P300M_HS_6_1_HS_WithCollision_Error][OT2_P20S_P300M_HS_6_1_HS_WithCollision_Error].json index ee9197847c7..7ddf6a256b3 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_P300M_HS_6_1_HS_WithCollision_Error][OT2_P20S_P300M_HS_6_1_HS_WithCollision_Error].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_P300M_HS_6_1_HS_WithCollision_Error][OT2_P20S_P300M_HS_6_1_HS_WithCollision_Error].json @@ -5199,11 +5199,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -5211,11 +5211,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_P300M_NoMods_6_1_TransferReTransferLiquid][OT2_P20S_P300M_NoMods_6_1_TransferReTransferLiquid].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_P300M_NoMods_6_1_TransferReTransferLiquid][OT2_P20S_P300M_NoMods_6_1_TransferReTransferLiquid].json index 2d3ce8f1f41..ebd39948382 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_P300M_NoMods_6_1_TransferReTransferLiquid][OT2_P20S_P300M_NoMods_6_1_TransferReTransferLiquid].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P20S_P300M_NoMods_6_1_TransferReTransferLiquid][OT2_P20S_P300M_NoMods_6_1_TransferReTransferLiquid].json @@ -10402,11 +10402,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -10414,11 +10414,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300MLeft_MM_TM_2_4_Zymo][OT2_P300MLeft_MM_TM_2_4_Zymo].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300MLeft_MM_TM_2_4_Zymo][OT2_P300MLeft_MM_TM_2_4_Zymo].json index 496d3b3215b..9cc5da41b57 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300MLeft_MM_TM_2_4_Zymo][OT2_P300MLeft_MM_TM_2_4_Zymo].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300MLeft_MM_TM_2_4_Zymo][OT2_P300MLeft_MM_TM_2_4_Zymo].json @@ -68269,11 +68269,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -68281,11 +68281,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_HS_6_1_Smoke620release][OT2_P300M_P20S_HS_6_1_Smoke620release].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_HS_6_1_Smoke620release][OT2_P300M_P20S_HS_6_1_Smoke620release].json index d2120a5e59c..204b889b805 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_HS_6_1_Smoke620release][OT2_P300M_P20S_HS_6_1_Smoke620release].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_HS_6_1_Smoke620release][OT2_P300M_P20S_HS_6_1_Smoke620release].json @@ -8320,11 +8320,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -8332,11 +8332,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error][OT2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error][OT2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error].json index 030a512c1b9..bf40aa22eb9 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error][OT2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error][OT2_P300M_P20S_MM_HS_TD_TC_6_1_AllMods_Error].json @@ -7214,11 +7214,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -7226,11 +7226,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error][OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error][OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error].json index 2d90b040dc4..35f1d36bbc2 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error][OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error][OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40Error].json @@ -6935,11 +6935,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -6947,11 +6947,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40][OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40][OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40].json index 4af7509f7d6..d726a7b26d9 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40][OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40][OT2_P300M_P20S_MM_TM_TC1_5_2_6_PD40].json @@ -9461,11 +9461,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -9473,11 +9473,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids][OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids][OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids].json index 5641ddaece5..131a55cc052 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids][OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids][OT2_P300M_P20S_NoMod_6_1_MixTransferManyLiquids].json @@ -5157,11 +5157,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -5169,11 +5169,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_None_2_12_FailOnRun][OT2_P300M_P20S_None_2_12_FailOnRun].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_None_2_12_FailOnRun][OT2_P300M_P20S_None_2_12_FailOnRun].json index b912ade51a1..44943a3a477 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_None_2_12_FailOnRun][OT2_P300M_P20S_None_2_12_FailOnRun].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_None_2_12_FailOnRun][OT2_P300M_P20S_None_2_12_FailOnRun].json @@ -2580,11 +2580,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -2592,11 +2592,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3].json index d1552cea358..992ce9b1ab6 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3].json @@ -12278,11 +12278,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -12290,11 +12290,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_14_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_14_SmokeTestV3].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_14_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_14_SmokeTestV3].json index 453d0f5728c..f71559d371f 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_14_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_14_SmokeTestV3].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_14_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_14_SmokeTestV3].json @@ -12471,11 +12471,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -12483,11 +12483,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_15_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_15_SmokeTestV3].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_15_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_15_SmokeTestV3].json index 236cea3e171..ead87297d91 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_15_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_15_SmokeTestV3].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_HS_TM_2_15_SmokeTestV3][OT2_P300M_P20S_TC_HS_TM_2_15_SmokeTestV3].json @@ -15020,11 +15020,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -15032,11 +15032,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_MM_TM_2_13_Smoke620Release][OT2_P300M_P20S_TC_MM_TM_2_13_Smoke620Release].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_MM_TM_2_13_Smoke620Release][OT2_P300M_P20S_TC_MM_TM_2_13_Smoke620Release].json index be634668ccd..f8f4aa80670 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_MM_TM_2_13_Smoke620Release][OT2_P300M_P20S_TC_MM_TM_2_13_Smoke620Release].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P20S_TC_MM_TM_2_13_Smoke620Release][OT2_P300M_P20S_TC_MM_TM_2_13_Smoke620Release].json @@ -9712,11 +9712,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -9724,11 +9724,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P300S_HS_6_1_HS_NormalUseWithTransfer][OT2_P300M_P300S_HS_6_1_HS_NormalUseWithTransfer].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P300S_HS_6_1_HS_NormalUseWithTransfer][OT2_P300M_P300S_HS_6_1_HS_NormalUseWithTransfer].json index da82aa98ebb..ceb61e773b2 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P300S_HS_6_1_HS_NormalUseWithTransfer][OT2_P300M_P300S_HS_6_1_HS_NormalUseWithTransfer].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300M_P300S_HS_6_1_HS_NormalUseWithTransfer][OT2_P300M_P300S_HS_6_1_HS_NormalUseWithTransfer].json @@ -6270,11 +6270,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -6282,11 +6282,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SG1_None_5_2_6_Gen1PipetteSimple][OT2_P300SG1_None_5_2_6_Gen1PipetteSimple].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SG1_None_5_2_6_Gen1PipetteSimple][OT2_P300SG1_None_5_2_6_Gen1PipetteSimple].json index fe6c424d032..91fe817101f 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SG1_None_5_2_6_Gen1PipetteSimple][OT2_P300SG1_None_5_2_6_Gen1PipetteSimple].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SG1_None_5_2_6_Gen1PipetteSimple][OT2_P300SG1_None_5_2_6_Gen1PipetteSimple].json @@ -5689,11 +5689,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -5701,11 +5701,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM1_MM_2_2_EngageMagHeightFromBase][OT2_P300SLeft_MM1_MM_2_2_EngageMagHeightFromBase].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM1_MM_2_2_EngageMagHeightFromBase][OT2_P300SLeft_MM1_MM_2_2_EngageMagHeightFromBase].json index fd0f07147ee..43b6661ce7f 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM1_MM_2_2_EngageMagHeightFromBase][OT2_P300SLeft_MM1_MM_2_2_EngageMagHeightFromBase].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM1_MM_2_2_EngageMagHeightFromBase][OT2_P300SLeft_MM1_MM_2_2_EngageMagHeightFromBase].json @@ -1513,11 +1513,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -1525,11 +1525,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM1_MM_TM_2_3_Mix][OT2_P300SLeft_MM1_MM_TM_2_3_Mix].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM1_MM_TM_2_3_Mix][OT2_P300SLeft_MM1_MM_TM_2_3_Mix].json index e9677eeb9c9..e4894f16cbf 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM1_MM_TM_2_3_Mix][OT2_P300SLeft_MM1_MM_TM_2_3_Mix].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM1_MM_TM_2_3_Mix][OT2_P300SLeft_MM1_MM_TM_2_3_Mix].json @@ -3245,11 +3245,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -3257,11 +3257,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM_TM_TM_5_2_6_MOAMTemps][OT2_P300SLeft_MM_TM_TM_5_2_6_MOAMTemps].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM_TM_TM_5_2_6_MOAMTemps][OT2_P300SLeft_MM_TM_TM_5_2_6_MOAMTemps].json index d884d7c28b2..c91382d72db 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM_TM_TM_5_2_6_MOAMTemps][OT2_P300SLeft_MM_TM_TM_5_2_6_MOAMTemps].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300SLeft_MM_TM_TM_5_2_6_MOAMTemps][OT2_P300SLeft_MM_TM_TM_5_2_6_MOAMTemps].json @@ -2406,11 +2406,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -2418,11 +2418,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300S_Thermocycler_Moam_Error][OT2_P300S_Thermocycler_Moam_Error].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300S_Thermocycler_Moam_Error][OT2_P300S_Thermocycler_Moam_Error].json index bcb4efc922e..008e0694a46 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300S_Thermocycler_Moam_Error][OT2_P300S_Thermocycler_Moam_Error].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300S_Thermocycler_Moam_Error][OT2_P300S_Thermocycler_Moam_Error].json @@ -2688,11 +2688,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -2700,11 +2700,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300S_Twinning_Error][OT2_P300S_Twinning_Error].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300S_Twinning_Error][OT2_P300S_Twinning_Error].json index 466beb8286c..8eba5b6559c 100644 --- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300S_Twinning_Error][OT2_P300S_Twinning_Error].json +++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[OT2_P300S_Twinning_Error][OT2_P300S_Twinning_Error].json @@ -2718,11 +2718,11 @@ "role": "main" }, { - "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", + "name": "cpx_4_tuberack_100ul.json", "role": "labware" }, { - "name": "sample_labware.json", + "name": "opentrons_ot3_96_tiprack_1000ul_rss.json", "role": "labware" }, { @@ -2730,11 +2730,11 @@ "role": "labware" }, { - "name": "cpx_4_tuberack_100ul.json", + "name": "opentrons_ot3_96_tiprack_50ul_rss.json", "role": "labware" }, { - "name": "opentrons_ot3_96_tiprack_50ul_rss.json", + "name": "sample_labware.json", "role": "labware" } ], diff --git a/app-testing/tests/analyses_snapshot_test.py b/app-testing/tests/analyses_snapshot_test.py index 37ea75f90c0..36fe84c1957 100644 --- a/app-testing/tests/analyses_snapshot_test.py +++ b/app-testing/tests/analyses_snapshot_test.py @@ -1,7 +1,7 @@ import json import os from pathlib import Path -from typing import List +from typing import Any, List import pytest from automation.data.protocol import Protocol @@ -61,9 +61,10 @@ def analyze_protocols() -> None: else: generate_analyses_from_test(tag=target, protocols=tests) -def sort_all_lists(d, sort_key=None): - """ Recursively sorts lists in a nested dictionary. - + +def sort_all_lists(d: Any, sort_key: str | None = None) -> Any: + """Recursively sorts lists in a nested dictionary. + :param d: The dictionary or list to sort. :param sort_key: The key to sort dictionaries on if they are in a list. """ @@ -83,6 +84,8 @@ def sort_all_lists(d, sort_key=None): return sorted_list else: return d + + # Read in what protocols to test from the environment variable # APP_ANALYSIS_TEST_PROTOCOLS # Generate all the analyses for the target version of the Opentrons repository @@ -107,7 +110,7 @@ def test_analysis_snapshot(analyze_protocols: None, snapshot_json: SerializableD with open(analysis, "r") as f: data = json.load(f) print(f"Test name: {protocol.file_name}") - data = sort_all_lists(data) + data = sort_all_lists(data, sort_key="name") assert snapshot_json(name=protocol.file_name) == data else: raise AssertionError(f"Analysis file not found: {analysis}")