86
86
)
87
87
from opentrons .protocol_engine .commands import (
88
88
CommandStatus ,
89
- LoadLabwareResult ,
90
- LoadLabware ,
91
- LoadLabwareParams ,
89
+ Command ,
92
90
LoadModuleResult ,
93
91
LoadModule ,
94
92
LoadModuleParams ,
129
127
paddingOffset ,
130
128
mountOffset ,
131
129
)
130
+
131
+ from .command_fixtures import (
132
+ create_comment_command ,
133
+ )
132
134
from .inner_geometry_test_params import INNER_WELL_GEOMETRY_TEST_PARAMS
133
135
from ..pipette_fixtures import get_default_nozzle_map
134
136
from ..mock_circular_frusta import TEST_EXAMPLES as CIRCULAR_TEST_EXAMPLES
@@ -381,6 +383,11 @@ def my_cool_test(subject: GeometryView) -> None:
381
383
)
382
384
383
385
386
+ def _dummy_command () -> Command :
387
+ """Return a placeholder command."""
388
+ return create_comment_command ()
389
+
390
+
384
391
def test_get_labware_parent_position (
385
392
decoy : Decoy ,
386
393
mock_labware_view : LabwareView ,
@@ -3093,23 +3100,7 @@ def test_get_offset_location_deck_slot(
3093
3100
) -> None :
3094
3101
"""Test if you can get the offset location of a labware in a deck slot."""
3095
3102
action = SucceedCommandAction (
3096
- command = LoadLabware (
3097
- id = "load-labware-1" ,
3098
- createdAt = datetime .now (),
3099
- key = "load-labware-1" ,
3100
- status = CommandStatus .SUCCEEDED ,
3101
- result = LoadLabwareResult (
3102
- labwareId = "labware-id-1" ,
3103
- definition = nice_labware_definition ,
3104
- offsetId = None ,
3105
- ),
3106
- params = LoadLabwareParams (
3107
- location = DeckSlotLocation (slotName = DeckSlotName .SLOT_C2 ),
3108
- loadName = nice_labware_definition .parameters .loadName ,
3109
- namespace = nice_labware_definition .namespace ,
3110
- version = nice_labware_definition .version ,
3111
- ),
3112
- ),
3103
+ command = _dummy_command (),
3113
3104
state_update = StateUpdate (
3114
3105
loaded_labware = LoadedLabwareUpdate (
3115
3106
labware_id = "labware-id-1" ,
@@ -3155,23 +3146,7 @@ def test_get_offset_location_module(
3155
3146
),
3156
3147
)
3157
3148
load_labware = SucceedCommandAction (
3158
- command = LoadLabware (
3159
- id = "load-labware-1" ,
3160
- createdAt = datetime .now (),
3161
- key = "load-labware-1" ,
3162
- status = CommandStatus .SUCCEEDED ,
3163
- result = LoadLabwareResult (
3164
- labwareId = "labware-id-1" ,
3165
- definition = nice_labware_definition ,
3166
- offsetId = None ,
3167
- ),
3168
- params = LoadLabwareParams (
3169
- location = ModuleLocation (moduleId = "module-id-1" ),
3170
- loadName = nice_labware_definition .parameters .loadName ,
3171
- namespace = nice_labware_definition .namespace ,
3172
- version = nice_labware_definition .version ,
3173
- ),
3174
- ),
3149
+ command = _dummy_command (),
3175
3150
state_update = StateUpdate (
3176
3151
loaded_labware = LoadedLabwareUpdate (
3177
3152
labware_id = "labware-id-1" ,
@@ -3226,23 +3201,7 @@ def test_get_offset_location_module_with_adapter(
3226
3201
),
3227
3202
)
3228
3203
load_adapter = SucceedCommandAction (
3229
- command = LoadLabware (
3230
- id = "load-adapter-1" ,
3231
- createdAt = datetime .now (),
3232
- key = "load-adapter-1" ,
3233
- status = CommandStatus .SUCCEEDED ,
3234
- result = LoadLabwareResult (
3235
- labwareId = "adapter-id-1" ,
3236
- definition = nice_adapter_definition ,
3237
- offsetId = None ,
3238
- ),
3239
- params = LoadLabwareParams (
3240
- location = ModuleLocation (moduleId = "module-id-1" ),
3241
- loadName = nice_adapter_definition .parameters .loadName ,
3242
- namespace = nice_adapter_definition .namespace ,
3243
- version = nice_adapter_definition .version ,
3244
- ),
3245
- ),
3204
+ command = _dummy_command (),
3246
3205
state_update = StateUpdate (
3247
3206
loaded_labware = LoadedLabwareUpdate (
3248
3207
labware_id = "adapter-id-1" ,
@@ -3254,23 +3213,7 @@ def test_get_offset_location_module_with_adapter(
3254
3213
),
3255
3214
)
3256
3215
load_labware = SucceedCommandAction (
3257
- command = LoadLabware (
3258
- id = "load-labware-1" ,
3259
- createdAt = datetime .now (),
3260
- key = "load-labware-1" ,
3261
- status = CommandStatus .SUCCEEDED ,
3262
- result = LoadLabwareResult (
3263
- labwareId = "labware-id-1" ,
3264
- definition = nice_labware_definition ,
3265
- offsetId = None ,
3266
- ),
3267
- params = LoadLabwareParams (
3268
- location = OnLabwareLocation (labwareId = "adapter-id-1" ),
3269
- loadName = nice_labware_definition .parameters .loadName ,
3270
- namespace = nice_labware_definition .namespace ,
3271
- version = nice_labware_definition .version ,
3272
- ),
3273
- ),
3216
+ command = _dummy_command (),
3274
3217
state_update = StateUpdate (
3275
3218
loaded_labware = LoadedLabwareUpdate (
3276
3219
labware_id = "labware-id-1" ,
@@ -3307,23 +3250,7 @@ def test_get_offset_fails_with_off_deck_labware(
3307
3250
) -> None :
3308
3251
"""You cannot get the offset location for a labware loaded OFF_DECK."""
3309
3252
action = SucceedCommandAction (
3310
- command = LoadLabware (
3311
- id = "load-labware-1" ,
3312
- createdAt = datetime .now (),
3313
- key = "load-labware-1" ,
3314
- status = CommandStatus .SUCCEEDED ,
3315
- result = LoadLabwareResult (
3316
- labwareId = "labware-id-1" ,
3317
- definition = nice_labware_definition ,
3318
- offsetId = None ,
3319
- ),
3320
- params = LoadLabwareParams (
3321
- location = OFF_DECK_LOCATION ,
3322
- loadName = nice_labware_definition .parameters .loadName ,
3323
- namespace = nice_labware_definition .namespace ,
3324
- version = nice_labware_definition .version ,
3325
- ),
3326
- ),
3253
+ command = _dummy_command (),
3327
3254
state_update = StateUpdate (
3328
3255
loaded_labware = LoadedLabwareUpdate (
3329
3256
labware_id = "labware-id-1" ,
@@ -3434,9 +3361,7 @@ def _find_volume_from_height_(index: int) -> None:
3434
3361
3435
3362
@pytest .mark .parametrize ("frustum" , CIRCULAR_TEST_EXAMPLES )
3436
3363
def test_circular_frustum_math_helpers (
3437
- decoy : Decoy ,
3438
3364
frustum : Dict [str , List [float ]],
3439
- subject : GeometryView ,
3440
3365
) -> None :
3441
3366
"""Test both height and volume calculation within a given circular frustum."""
3442
3367
total_frustum_height = frustum ["height" ][0 ]
@@ -3794,23 +3719,7 @@ def test_get_location_sequence_deck_slot(
3794
3719
) -> None :
3795
3720
"""Test if you can get the location sequence of a labware in a deck slot."""
3796
3721
action = SucceedCommandAction (
3797
- command = LoadLabware (
3798
- id = "load-labware-1" ,
3799
- createdAt = datetime .now (),
3800
- key = "load-labware-1" ,
3801
- status = CommandStatus .SUCCEEDED ,
3802
- result = LoadLabwareResult (
3803
- labwareId = "labware-id-1" ,
3804
- definition = nice_labware_definition ,
3805
- offsetId = None ,
3806
- ),
3807
- params = LoadLabwareParams (
3808
- location = DeckSlotLocation (slotName = DeckSlotName .SLOT_C2 ),
3809
- loadName = nice_labware_definition .parameters .loadName ,
3810
- namespace = nice_labware_definition .namespace ,
3811
- version = nice_labware_definition .version ,
3812
- ),
3813
- ),
3722
+ command = _dummy_command (),
3814
3723
state_update = StateUpdate (
3815
3724
loaded_labware = LoadedLabwareUpdate (
3816
3725
labware_id = "labware-id-1" ,
@@ -3867,23 +3776,7 @@ def test_get_location_sequence_module(
3867
3776
),
3868
3777
)
3869
3778
load_labware = SucceedCommandAction (
3870
- command = LoadLabware (
3871
- id = "load-labware-1" ,
3872
- createdAt = datetime .now (),
3873
- key = "load-labware-1" ,
3874
- status = CommandStatus .SUCCEEDED ,
3875
- result = LoadLabwareResult (
3876
- labwareId = "labware-id-1" ,
3877
- definition = nice_labware_definition ,
3878
- offsetId = None ,
3879
- ),
3880
- params = LoadLabwareParams (
3881
- location = ModuleLocation (moduleId = "module-id-1" ),
3882
- loadName = nice_labware_definition .parameters .loadName ,
3883
- namespace = nice_labware_definition .namespace ,
3884
- version = nice_labware_definition .version ,
3885
- ),
3886
- ),
3779
+ command = _dummy_command (),
3887
3780
state_update = StateUpdate (
3888
3781
loaded_labware = LoadedLabwareUpdate (
3889
3782
labware_id = "labware-id-1" ,
@@ -3947,23 +3840,7 @@ def test_get_location_sequence_module_with_adapter(
3947
3840
),
3948
3841
)
3949
3842
load_adapter = SucceedCommandAction (
3950
- command = LoadLabware (
3951
- id = "load-adapter-1" ,
3952
- createdAt = datetime .now (),
3953
- key = "load-adapter-1" ,
3954
- status = CommandStatus .SUCCEEDED ,
3955
- result = LoadLabwareResult (
3956
- labwareId = "adapter-id-1" ,
3957
- definition = nice_adapter_definition ,
3958
- offsetId = None ,
3959
- ),
3960
- params = LoadLabwareParams (
3961
- location = ModuleLocation (moduleId = "module-id-1" ),
3962
- loadName = nice_adapter_definition .parameters .loadName ,
3963
- namespace = nice_adapter_definition .namespace ,
3964
- version = nice_adapter_definition .version ,
3965
- ),
3966
- ),
3843
+ command = _dummy_command (),
3967
3844
state_update = StateUpdate (
3968
3845
loaded_labware = LoadedLabwareUpdate (
3969
3846
labware_id = "adapter-id-1" ,
@@ -3975,23 +3852,7 @@ def test_get_location_sequence_module_with_adapter(
3975
3852
),
3976
3853
)
3977
3854
load_labware = SucceedCommandAction (
3978
- command = LoadLabware (
3979
- id = "load-labware-1" ,
3980
- createdAt = datetime .now (),
3981
- key = "load-labware-1" ,
3982
- status = CommandStatus .SUCCEEDED ,
3983
- result = LoadLabwareResult (
3984
- labwareId = "labware-id-1" ,
3985
- definition = nice_labware_definition ,
3986
- offsetId = None ,
3987
- ),
3988
- params = LoadLabwareParams (
3989
- location = OnLabwareLocation (labwareId = "adapter-id-1" ),
3990
- loadName = nice_labware_definition .parameters .loadName ,
3991
- namespace = nice_labware_definition .namespace ,
3992
- version = nice_labware_definition .version ,
3993
- ),
3994
- ),
3855
+ command = _dummy_command (),
3995
3856
state_update = StateUpdate (
3996
3857
loaded_labware = LoadedLabwareUpdate (
3997
3858
labware_id = "labware-id-1" ,
@@ -4028,23 +3889,7 @@ def test_get_location_sequence_off_deck(
4028
3889
) -> None :
4029
3890
"""You cannot get the location sequence for a labware loaded OFF_DECK."""
4030
3891
action = SucceedCommandAction (
4031
- command = LoadLabware (
4032
- id = "load-labware-1" ,
4033
- createdAt = datetime .now (),
4034
- key = "load-labware-1" ,
4035
- status = CommandStatus .SUCCEEDED ,
4036
- result = LoadLabwareResult (
4037
- labwareId = "labware-id-1" ,
4038
- definition = nice_labware_definition ,
4039
- offsetId = None ,
4040
- ),
4041
- params = LoadLabwareParams (
4042
- location = OFF_DECK_LOCATION ,
4043
- loadName = nice_labware_definition .parameters .loadName ,
4044
- namespace = nice_labware_definition .namespace ,
4045
- version = nice_labware_definition .version ,
4046
- ),
4047
- ),
3892
+ command = _dummy_command (),
4048
3893
state_update = StateUpdate (
4049
3894
loaded_labware = LoadedLabwareUpdate (
4050
3895
labware_id = "labware-id-1" ,
@@ -4096,23 +3941,7 @@ def test_get_location_sequence_stacker_hopper(
4096
3941
),
4097
3942
)
4098
3943
load_labware = SucceedCommandAction (
4099
- command = LoadLabware (
4100
- id = "load-labware-1" ,
4101
- createdAt = datetime .now (),
4102
- key = "load-labware-1" ,
4103
- status = CommandStatus .SUCCEEDED ,
4104
- result = LoadLabwareResult (
4105
- labwareId = "labware-id-1" ,
4106
- definition = nice_labware_definition ,
4107
- offsetId = None ,
4108
- ),
4109
- params = LoadLabwareParams (
4110
- location = ModuleLocation (moduleId = "module-id-1" ),
4111
- loadName = nice_labware_definition .parameters .loadName ,
4112
- namespace = nice_labware_definition .namespace ,
4113
- version = nice_labware_definition .version ,
4114
- ),
4115
- ),
3944
+ command = _dummy_command (),
4116
3945
state_update = StateUpdate (
4117
3946
loaded_labware = LoadedLabwareUpdate (
4118
3947
labware_id = "labware-id-1" ,
0 commit comments