Skip to content

Commit

Permalink
fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jenshnielsen committed Feb 24, 2022
1 parent a4b233b commit ca2ae42
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions qcodes/tests/dataset/test_database_extract_runs.py
Expand Up @@ -52,8 +52,8 @@ def raise_if_file_changed(path_to_file: str):
raise RuntimeError(f'File {path_to_file} was modified.')


@pytest.fixture(scope='function')
def inst():
@pytest.fixture(scope="function", name="inst")
def _make_inst():
"""
Dummy instrument for testing, ensuring that it's instance gets closed
and removed from the global register of instruments, which, if not done,
Expand Down Expand Up @@ -191,7 +191,7 @@ def test_real_dataset_1d(two_empty_temp_db_connections, inst):

source_exp = load_or_create_experiment(experiment_name="myexp", conn=source_conn)

source_dataset, a, b = do1d(inst.back, 0, 1, 10, 0, inst.plunger, exp=source_exp)
source_dataset, _, _ = do1d(inst.back, 0, 1, 10, 0, inst.plunger, exp=source_exp)

extract_runs_into_db(source_path, target_path, source_dataset.run_id)

Expand All @@ -217,7 +217,7 @@ def test_real_dataset_2d(two_empty_temp_db_connections, inst):

source_exp = load_or_create_experiment(experiment_name="myexp", conn=source_conn)

source_dataset, a, b = do2d(
source_dataset, _, _ = do2d(
inst.back, 0, 1, 10, 0, inst.plunger, 0, 0.1, 15, 0, inst.cutter, exp=source_exp
)

Expand Down
2 changes: 1 addition & 1 deletion qcodes/tests/dataset/test_sqlite_base.py
Expand Up @@ -14,7 +14,7 @@
import qcodes.dataset.descriptions.versioning.serialization as serial
from qcodes.dataset.data_set import DataSet
from qcodes.dataset.descriptions.dependencies import InterDependencies_
from qcodes.dataset.descriptions.param_spec import ParamSpec, ParamSpecBase
from qcodes.dataset.descriptions.param_spec import ParamSpecBase
from qcodes.dataset.descriptions.rundescriber import RunDescriber
from qcodes.dataset.guids import generate_guid

Expand Down

0 comments on commit ca2ae42

Please sign in to comment.