Skip to content

Commit

Permalink
fix(app-testing): more sorting
Browse files Browse the repository at this point in the history
  • Loading branch information
y3rsh committed Dec 16, 2023
1 parent ccbff28 commit 3933a84
Show file tree
Hide file tree
Showing 38 changed files with 153 additions and 151 deletions.
3 changes: 1 addition & 2 deletions app-testing/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9971,23 +9971,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11818,23 +11818,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28270,23 +28270,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95666,23 +95666,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13269,23 +13269,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13067,23 +13067,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5712,23 +5712,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11017,23 +11017,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13148,23 +13148,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140640,23 +140640,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1815,23 +1815,23 @@
"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"
},
{
"name": "opentrons_ot3_96_tiprack_200ul_rss.json",
"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"
}
],
Expand Down
Loading

0 comments on commit 3933a84

Please sign in to comment.