Commit e7f7135c authored by Wout De Nolf's avatar Wout De Nolf
Browse files

[test] helper module import in writer tests

parent bd84eaa2
Pipeline #33696 passed with stages
in 97 minutes and 58 seconds
......@@ -16,9 +16,8 @@ from bliss.common.tango import DevState, Database
from nexus_writer_service.subscribers.session_writer import all_cli_saveoptions
from bliss.tango.clients.utils import wait_tango_device
sys.path.append(os.path.join(os.path.dirname(__file__), "helpers"))
import nxw_test_config
import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_config
from tests.nexus_writer.helpers import nxw_test_utils
@pytest.fixture
......
......@@ -16,8 +16,7 @@ from nexus_writer_service.subscribers.scan_writer_base import (
from nexus_writer_service.subscribers.scan_writer_config import (
default_saveoptions as config_options
)
import nxw_test_config
import nxw_test_utils
from . import nxw_test_config
def assert_scan_data(scan, **kwargs):
......
......@@ -5,12 +5,11 @@
# Copyright (c) 2015-2020 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
import numpy
import random
import itertools
from nexus_writer_service.utils import array_order
from nxw_test_math import asproduct
from tests.nexus_writer.helpers.nxw_test_math import asproduct
def test_order_ravel():
......
......@@ -9,7 +9,7 @@ import numpy
import itertools
from nexus_writer_service.utils import data_merging
from nexus_writer_service.utils.array_order import Order
from nxw_test_math import asproduct
from tests.nexus_writer.helpers.nxw_test_math import asproduct
def test_data_merging_general():
......
......@@ -10,10 +10,10 @@ import numpy
import random
import itertools
from fabio.edfimage import EdfImage
from nxw_test_math import asproduct
from nexus_writer_service.subscribers.dataset_proxy import DatasetProxy
from nexus_writer_service.io import nexus
from nexus_writer_service.utils.array_order import Order
from tests.nexus_writer.helpers.nxw_test_math import asproduct
def test_dataset_proxy(tmpdir):
......
......@@ -6,8 +6,8 @@
# Distributed under the GNU LGPLv3. See LICENSE for more info.
from bliss.common import scans
import nxw_test_utils
import nxw_test_data
from tests.nexus_writer.helpers import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_data
def test_nxw_a2scan(nexus_writer_config):
......
......@@ -6,8 +6,8 @@
# Distributed under the GNU LGPLv3. See LICENSE for more info.
from bliss.common import scans
import nxw_test_utils
import nxw_test_data
from tests.nexus_writer.helpers import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_data
def test_nxw_amesh(nexus_writer_config):
......
......@@ -6,8 +6,8 @@
# Distributed under the GNU LGPLv3. See LICENSE for more info.
from bliss.common import scans
import nxw_test_utils
import nxw_test_data
from tests.nexus_writer.helpers import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_data
def test_nxw_ascan(nexus_writer_config):
......
......@@ -5,13 +5,12 @@
# Copyright (c) 2015-2020 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
import os
import pytest
import gevent
import nxw_test_utils
from bliss.common import scans
from nexus_writer_service.utils.scan_utils import session_filename
from tests.nexus_writer.helpers import nxw_test_utils
def test_nxw_crash(nexus_writer_config):
......
......@@ -6,8 +6,8 @@
# Distributed under the GNU LGPLv3. See LICENSE for more info.
from bliss.common import scans
import nxw_test_utils
import nxw_test_data
from tests.nexus_writer.helpers import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_data
def test_nxw_ct(nexus_writer_config):
......
......@@ -6,7 +6,7 @@
# Distributed under the GNU LGPLv3. See LICENSE for more info.
from bliss.common import scans
import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_utils
def test_nxw_events(nexus_writer_config):
......
......@@ -6,9 +6,8 @@
# Copyright (c) 2015-2019 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
import nxw_test_utils
import nxw_test_data
from tests.nexus_writer.helpers import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_data
def test_nxw_limact(nexus_writer_config):
......
......@@ -6,8 +6,8 @@
# Distributed under the GNU LGPLv3. See LICENSE for more info.
from bliss.common import scans
import nxw_test_utils
import nxw_test_data
from tests.nexus_writer.helpers import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_data
def test_nxw_loopscan(nexus_writer_config):
......
......@@ -6,9 +6,8 @@
# Copyright (c) 2015-2020 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
import nxw_test_utils
import nxw_test_data
from tests.nexus_writer.helpers import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_data
def test_nxw_mtopmaster(nexus_writer_config):
......
......@@ -6,8 +6,8 @@
# Distributed under the GNU LGPLv3. See LICENSE for more info.
from bliss.common import scans
import nxw_test_utils
import nxw_test_data
from tests.nexus_writer.helpers import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_data
def test_nxw_notes(nexus_writer_config):
......
......@@ -5,10 +5,9 @@
# Copyright (c) 2015-2020 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
import nxw_test_utils
import nxw_test_data
from bliss.common import scans
from tests.nexus_writer.helpers import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_data
def test_nxw_parallel(nexus_writer_config):
......
......@@ -5,14 +5,13 @@
# Copyright (c) 2015-2020 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
import os
import pytest
import nxw_test_utils
from bliss.common import scans
from nexus_writer_service.utils.scan_utils import scan_filename
from nexus_writer_service.io.io_utils import mkdir
from nexus_writer_service.io import nexus
from tests.nexus_writer.helpers import nxw_test_utils
def test_nxw_permissions(nexus_writer_config):
......
......@@ -7,8 +7,8 @@
from bliss.common import scans
from bliss.common.plot import plotselect, plotinit
import nxw_test_utils
import nxw_test_data
from tests.nexus_writer.helpers import nxw_test_utils
from tests.nexus_writer.helpers import nxw_test_data
def test_nxw_plotselect(nexus_writer_config):
......
......@@ -5,15 +5,14 @@
# Copyright (c) 2015-2020 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
import gevent
import pytest
import nxw_test_data
import nxw_test_utils
from bliss.common import scans
from bliss.common.tango import DevState
from nexus_writer_service.utils import scan_utils
from nexus_writer_service.io import nexus
from tests.nexus_writer.helpers import nxw_test_data
from tests.nexus_writer.helpers import nxw_test_utils
def test_nxw_readers(nexus_writer_config):
......
......@@ -7,8 +7,8 @@
import pytest
from bliss.common import scans
import nxw_test_utils
from nexus_writer_service.io import nexus
from tests.nexus_writer.helpers import nxw_test_utils
def test_nxw_scan_exists(nexus_writer_config):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment