From 2743955b6845d44325f658431513a85a4eb6466a Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Tue, 5 Jul 2022 15:46:19 +0200 Subject: [PATCH] test dond cleanup imports --- qcodes/tests/dataset/test_doNd.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/qcodes/tests/dataset/test_doNd.py b/qcodes/tests/dataset/test_doNd.py index aeea1804caed..93ad35314084 100644 --- a/qcodes/tests/dataset/test_doNd.py +++ b/qcodes/tests/dataset/test_doNd.py @@ -7,11 +7,22 @@ import numpy as np import pytest from hypothesis import HealthCheck, given, settings +from numpy.testing import assert_array_equal from qcodes import config, validators from qcodes.dataset import new_experiment from qcodes.dataset.data_set import DataSet -from qcodes.dataset.do_nd import ArraySweep, LinSweep, LogSweep, do0d, do1d, do2d, dond +from qcodes.dataset.do_nd import ( + ArraySweep, + LinSweep, + LogSweep, + MultiSweep, + _Sweeper, + do0d, + do1d, + do2d, + dond, +) from qcodes.parameters import Parameter, ParameterBase from qcodes.tests.instrument_mocks import ( ArraySetPointParam, @@ -1860,8 +1871,6 @@ def test_dond_2d_multi_datasets_with_callable_output_data( @pytest.mark.usefixtures("plot_close", "experiment") def test_dond_multi_sweep(_param_set, _param_set_2, _param, _param_2): - from qcodes.dataset.do_nd import MultiSweep - sweep_1 = LinSweep(_param_set, 0, 1, 10, 0) sweep_2 = LinSweep(_param_set_2, 1, 2, 10, 0) @@ -1883,9 +1892,6 @@ def test_dond_multi_sweep(_param_set, _param_set_2, _param, _param_2): def test_dond_multi_sweep_sweeper(_param_set, _param_set_2, _param): sweep_len = 10 - from numpy.testing import assert_array_equal - - from qcodes.dataset.do_nd import MultiSweep, _Sweeper sweep_1 = LinSweep(_param_set, 0, 1, sweep_len, 0)