Skip to content

Commit

Permalink
test dond cleanup imports
Browse files Browse the repository at this point in the history
  • Loading branch information
jenshnielsen committed Jul 7, 2022
1 parent c51bdcb commit 2743955
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions qcodes/tests/dataset/test_doNd.py
Expand Up @@ -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,
Expand Down Expand Up @@ -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)

Expand All @@ -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)

Expand Down

0 comments on commit 2743955

Please sign in to comment.