fix(test): snapshot renaming (#15038)

- Given the new protocol organization and naming - delete all the snapshots of the old naming `find -type f ! \( -name '*_S_*' -o -name '*_X_*' \) -exec rm {} +` - `make build-opentrons-analysis` (default on edge) - ` make snapshot-test-update` - find old snapshots and delete
Opentrons · Jun 3, 2024 · 874d6da · 874d6da
1 parent b572bcb
commit 874d6da
Show file tree

Hide file tree

Showing 40 changed files with 286 additions and 79,593 deletions.
diff --git a/...c9bfcd][Flex_P1000_96_TC_2_16_AnalysisError_PartialTipPickupThermocyclerLidConflict].json b/...c9bfcd][Flex_P1000_96_TC_2_16_AnalysisError_PartialTipPickupThermocyclerLidConflict].json
diff --git a/...sis_snapshot[19ffa9c839][OT2_X_v2_16_None_None_HS_HeaterShakerConflictWithTrashBin2].json b/...sis_snapshot[19ffa9c839][OT2_X_v2_16_None_None_HS_HeaterShakerConflictWithTrashBin2].json
@@ -2,13 +2,17 @@
   "commands": [
     {
       "commandType": "home",
+<<<<<<< HEAD
       "notes": [],
+=======
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
       "params": {},
       "result": {},
       "status": "succeeded"
     },
     {
       "commandType": "loadModule",
+<<<<<<< HEAD
       "error": {
         "detail": "Cannot use Temperature Module in C3, not compatible with one or more of the following fixtures: Slot C4",
         "errorCode": "4000",
@@ -17,13 +21,18 @@
         "wrappedErrors": []
       },
       "notes": [],
+=======
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
       "params": {
         "location": {
           "slotName": "9"
         },
         "model": "heaterShakerModuleV1"
       },
+<<<<<<< HEAD
 <<<<<<< HEAD:app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[19ffa9c839][OT2_X_v2_16_None_None_HS_HeaterShakerConflictWithTrashBin2].json
+=======
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
       "result": {
         "definition": {
           "calibrationPoint": {
@@ -464,9 +473,12 @@
         "model": "heaterShakerModuleV1"
       },
       "status": "succeeded"
+<<<<<<< HEAD
 =======
       "status": "failed"
 >>>>>>> f81f555a6d (fix(app-testing): snapshot failure capture (#14913)):app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[25f79fd65e][Flex_None_None_TM_2_16_AnalysisError_ModuleInStagingAreaCol3].json
+=======
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
     }
   ],
   "config": {
@@ -478,26 +490,42 @@
   },
   "errors": [
     {
+<<<<<<< HEAD
 <<<<<<< HEAD:app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[19ffa9c839][OT2_X_v2_16_None_None_HS_HeaterShakerConflictWithTrashBin2].json
       "detail": "DeckConflictError [line 11]: trash bin in slot 12 prevents heaterShakerModuleV1 from using slot 9.",
 =======
       "detail": "ProtocolCommandFailedError [line 17]: Error 4000 GENERAL_ERROR (ProtocolCommandFailedError): IncompatibleAddressableAreaError: Cannot use Temperature Module in C3, not compatible with one or more of the following fixtures: Slot C4",
 >>>>>>> f81f555a6d (fix(app-testing): snapshot failure capture (#14913)):app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[25f79fd65e][Flex_None_None_TM_2_16_AnalysisError_ModuleInStagingAreaCol3].json
+=======
+      "detail": "DeckConflictError [line 11]: trash bin in slot 12 prevents heaterShakerModuleV1 from using slot 9.",
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
       "errorCode": "4000",
       "errorInfo": {},
       "errorType": "ExceptionInProtocolError",
       "wrappedErrors": [
         {
+<<<<<<< HEAD
 <<<<<<< HEAD:app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[19ffa9c839][OT2_X_v2_16_None_None_HS_HeaterShakerConflictWithTrashBin2].json
           "detail": "opentrons.motion_planning.deck_conflict.DeckConflictError: trash bin in slot 12 prevents heaterShakerModuleV1 from using slot 9.",
 =======
           "detail": "IncompatibleAddressableAreaError: Cannot use Temperature Module in C3, not compatible with one or more of the following fixtures: Slot C4",
 >>>>>>> f81f555a6d (fix(app-testing): snapshot failure capture (#14913)):app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[25f79fd65e][Flex_None_None_TM_2_16_AnalysisError_ModuleInStagingAreaCol3].json
+=======
+          "detail": "opentrons.motion_planning.deck_conflict.DeckConflictError: trash bin in slot 12 prevents heaterShakerModuleV1 from using slot 9.",
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
           "errorCode": "4000",
           "errorInfo": {
             "args": "('trash bin in slot 12 prevents heaterShakerModuleV1 from using slot 9.',)",
             "class": "DeckConflictError",
+<<<<<<< HEAD
+            "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/execution/execute_python.py\", line 124, in run_python\n    exec(\"run(__context)\", new_globs)\n\n  File \"<string>\", line 1, in <module>\n\n  File \"OT2_X_v2_16_None_None_HS_HeaterShakerConflictWithTrashBin2.py\", line 11, in run\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/api_support/util.py\", line 383, in _check_version_wrapper\n    return decorated_obj(*args, **kwargs)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/protocol_context.py\", line 814, in load_module\n    module_core = self._core.load_module(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/core/engine/protocol.py\", line 423, in load_module\n    deck_conflict.check(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/core/engine/deck_conflict.py\", line 203, in check\n    wrapped_deck_conflict.check(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/motion_planning/deck_conflict.py\", line 210, in check\n    raise DeckConflictError(\n"
+=======
+<<<<<<<< HEAD:app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[3b1bfd0d2d][OT2_None_None_HS_2_16_AnalysisError_HeaterShakerConflictWithTrashBin2].json
+            "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/execution/execute_python.py\", line 124, in run_python\n    exec(\"run(__context)\", new_globs)\n\n  File \"<string>\", line 1, in <module>\n\n  File \"OT2_None_None_HS_2_16_AnalysisError_HeaterShakerConflictWithTrashBin2.py\", line 11, in run\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/api_support/util.py\", line 383, in _check_version_wrapper\n    return decorated_obj(*args, **kwargs)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/protocol_context.py\", line 814, in load_module\n    module_core = self._core.load_module(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/core/engine/protocol.py\", line 425, in load_module\n    deck_conflict.check(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/core/engine/deck_conflict.py\", line 203, in check\n    wrapped_deck_conflict.check(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/motion_planning/deck_conflict.py\", line 210, in check\n    raise DeckConflictError(\n"
+========
             "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/execution/execute_python.py\", line 124, in run_python\n    exec(\"run(__context)\", new_globs)\n\n  File \"<string>\", line 1, in <module>\n\n  File \"OT2_X_v2_16_None_None_HS_HeaterShakerConflictWithTrashBin2.py\", line 11, in run\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/api_support/util.py\", line 383, in _check_version_wrapper\n    return decorated_obj(*args, **kwargs)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/protocol_context.py\", line 814, in load_module\n    module_core = self._core.load_module(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/core/engine/protocol.py\", line 423, in load_module\n    deck_conflict.check(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/core/engine/deck_conflict.py\", line 203, in check\n    wrapped_deck_conflict.check(\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/motion_planning/deck_conflict.py\", line 210, in check\n    raise DeckConflictError(\n"
+>>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038)):app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[19ffa9c839][OT2_X_v2_16_None_None_HS_HeaterShakerConflictWithTrashBin2].json
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
           },
           "errorType": "PythonException",
           "wrappedErrors": []
@@ -536,7 +564,10 @@
   "metadata": {
     "protocolName": "Heater-shaker conflict OT-2"
   },
+<<<<<<< HEAD
 <<<<<<< HEAD:app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[19ffa9c839][OT2_X_v2_16_None_None_HS_HeaterShakerConflictWithTrashBin2].json
+=======
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
   "modules": [
     {
       "location": {
@@ -545,6 +576,7 @@
       "model": "heaterShakerModuleV1"
     }
   ],
+<<<<<<< HEAD
 =======
   "modules": [],
 >>>>>>> f81f555a6d (fix(app-testing): snapshot failure capture (#14913)):app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[25f79fd65e][Flex_None_None_TM_2_16_AnalysisError_ModuleInStagingAreaCol3].json
@@ -554,5 +586,9 @@
 =======
   "robotType": "OT-3 Standard",
 >>>>>>> ca2f7d91f0 (fix(app-testing): snapshot failure capture (#14586)):app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[25f79fd65e][Flex_None_None_TM_2_16_AnalysisError_ModuleInStagingAreaCol3].json
+=======
+  "pipettes": [],
+  "robotType": "OT-2 Standard",
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
   "runTimeParameters": []
 }
diff --git a/...hot_test/test_analysis_snapshot[24a6b167a7][OT2_X_v2_18_None_None_NoRTPdisplay_name].json b/...hot_test/test_analysis_snapshot[24a6b167a7][OT2_X_v2_18_None_None_NoRTPdisplay_name].json
@@ -26,15 +26,25 @@
           "detail": "TypeError: ParameterContext.add_int() missing 1 required positional argument: 'display_name'",
           "errorCode": "4000",
           "errorInfo": {
+<<<<<<< HEAD
 <<<<<<< HEAD:app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[24a6b167a7][OT2_X_v2_18_None_None_NoRTPdisplay_name].json
             "args": "(\"ParameterContext.add_int() missing 1 required positional argument: 'display_name'\",)",
             "class": "TypeError",
             "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/execution/execute_python.py\", line 80, in _parse_and_set_parameters\n    exec(\"add_parameters(__param_context)\", new_globs)\n\n  File \"<string>\", line 1, in <module>\n\n  File \"OT2_X_v2_18_None_None_NoRTPdisplay_name.py\", line 11, in add_parameters\n"
 =======
             "args": "('Cannot load a module onto a staging slot.',)",
             "class": "ValueError",
+<<<<<<<< HEAD:app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[24a6b167a7][OT2_X_v2_18_None_None_NoRTPdisplay_name].json
             "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/execution/execute_python.py\", line 124, in run_python\n    exec(\"run(__context)\", new_globs)\n\n  File \"<string>\", line 1, in <module>\n\n  File \"Flex_None_None_TM_2_16_AnalysisError_ModuleInStagingAreaCol4.py\", line 15, in run\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/api_support/util.py\", line 383, in _check_version_wrapper\n    return decorated_obj(*args, **kwargs)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/protocol_context.py\", line 812, in load_module\n    raise ValueError(\"Cannot load a module onto a staging slot.\")\n"
 >>>>>>> c3ee8d545c (fix(app-testing): snapshot failure capture (#14813)):app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[512a897a47][Flex_None_None_TM_2_16_AnalysisError_ModuleInStagingAreaCol4].json
+========
+            "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/execution/execute_python.py\", line 124, in run_python\n    exec(\"run(__context)\", new_globs)\n\n  File \"<string>\", line 1, in <module>\n\n  File \"Flex_X_v2_16_NO_PIPETTES_TM_ModuleInStagingAreaCol4.py\", line 15, in run\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/api_support/util.py\", line 383, in _check_version_wrapper\n    return decorated_obj(*args, **kwargs)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_api/protocol_context.py\", line 812, in load_module\n    raise ValueError(\"Cannot load a module onto a staging slot.\")\n"
+>>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038)):app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[6126498df7][Flex_X_v2_16_NO_PIPETTES_TM_ModuleInStagingAreaCol4].json
+=======
+            "args": "(\"ParameterContext.add_int() missing 1 required positional argument: 'display_name'\",)",
+            "class": "TypeError",
+            "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocols/execution/execute_python.py\", line 80, in _parse_and_set_parameters\n    exec(\"add_parameters(__param_context)\", new_globs)\n\n  File \"<string>\", line 1, in <module>\n\n  File \"OT2_X_v2_18_None_None_NoRTPdisplay_name.py\", line 11, in add_parameters\n"
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
           },
           "errorType": "PythonException",
           "wrappedErrors": []
@@ -44,7 +54,15 @@
   ],
   "files": [
     {
+<<<<<<< HEAD
+<<<<<<<< HEAD:app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[24a6b167a7][OT2_X_v2_18_None_None_NoRTPdisplay_name].json
+      "name": "OT2_X_v2_18_None_None_NoRTPdisplay_name.py",
+========
+      "name": "Flex_X_v2_16_NO_PIPETTES_TM_ModuleInStagingAreaCol4.py",
+>>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038)):app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[6126498df7][Flex_X_v2_16_NO_PIPETTES_TM_ModuleInStagingAreaCol4].json
+=======
       "name": "OT2_X_v2_18_None_None_NoRTPdisplay_name.py",
+>>>>>>> 929e01421e (fix(test): snapshot renaming (#15038))
       "role": "main"
     },
     {