Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

tests: don't use global instance in layer_scale test #298

Merged
merged 3 commits into from
Oct 26, 2023
Merged

tests: don't use global instance in layer_scale test #298

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
449e732
fix: don't use global instance in layer_scale test
tlambert03 Oct 26, 2023
5755185
use fixture instead
tlambert03 Oct 26, 2023
6cc0155
style: [pre-commit.ci] auto fixes [...]
pre-commit-ci[bot] Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/test_layer_scale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import pytest
from napari_micromanager._mda_handler import _NapariMDAHandler
from napari_micromanager._mda_meta import SEQUENCE_META_KEY, SequenceMeta
from pymmcore_plus import CMMCorePlus

if TYPE_CHECKING:
from napari_micromanager.main_window import MainWindow
from pymmcore_plus import CMMCorePlus
from useq import MDASequence


Expand All @@ -17,10 +17,10 @@ def test_layer_scale(
make_napari_viewer,
mda_sequence_splits: MDASequence,
axis_order: str,
core: CMMCorePlus,
) -> None:
mmc = CMMCorePlus.instance()
mmc.loadSystemConfiguration()
viewer = make_napari_viewer()
mmc = core
handler = _NapariMDAHandler(mmc, viewer)

mmc.setProperty("Objective", "Label", "Nikon 20X Plan Fluor ELWD")
Expand Down