From 50c3e5e47aaf7c8792983d85485139514cef0b80 Mon Sep 17 00:00:00 2001 From: Enrico Faulhaber Date: Tue, 4 Dec 2018 10:39:04 +0100 Subject: [PATCH] fix tests after isort change Change-Id: I15975e4a665342139f88060e2db95ee2984d8dfe Reviewed-on: https://forge.frm2.tum.de/review/19528 Tested-by: JenkinsCodeReview Reviewed-by: Enrico Faulhaber --- test/test_client_baseclient.py | 3 ++- test/test_datatypes.py | 7 ++----- test/test_lib_enum.py | 5 +---- test/test_modules.py | 5 ++--- test/test_params.py | 8 ++------ test/test_parse.py | 4 +--- 6 files changed, 10 insertions(+), 22 deletions(-) diff --git a/test/test_client_baseclient.py b/test/test_client_baseclient.py index 2f4b434..ffa9302 100644 --- a/test/test_client_baseclient.py +++ b/test/test_client_baseclient.py @@ -28,9 +28,10 @@ from os import path import pytest +sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..'))) + from secop.client.baseclient import Client -sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..'))) diff --git a/test/test_datatypes.py b/test/test_datatypes.py index 4fcb708..d9dcfc3 100644 --- a/test/test_datatypes.py +++ b/test/test_datatypes.py @@ -29,15 +29,12 @@ from os import path # no fixtures needed import pytest +sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..'))) + from secop.datatypes import (ArrayOf, BLOBType, BoolType, DataType, EnumType, FloatRange, IntRange, ProgrammingError, StringType, StructOf, TupleOf, get_datatype) -sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..'))) - - - - def test_DataType(): dt = DataType() diff --git a/test/test_lib_enum.py b/test/test_lib_enum.py index a16019f..eb7897f 100644 --- a/test/test_lib_enum.py +++ b/test/test_lib_enum.py @@ -29,12 +29,9 @@ from os import path # no fixtures needed import pytest -from secop.lib.enum import Enum, EnumMember - sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..'))) - - +from secop.lib.enum import Enum, EnumMember def test_EnumMember(): diff --git a/test/test_modules.py b/test/test_modules.py index 120192c..3f33020 100644 --- a/test/test_modules.py +++ b/test/test_modules.py @@ -28,14 +28,13 @@ from os import path # no fixtures needed import pytest +sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..'))) + from secop.datatypes import BoolType, EnumType from secop.metaclass import ModuleMeta from secop.modules import Communicator, Drivable, Module, Readable, Writable from secop.params import Command, Override, Parameter -sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..'))) - - try: import Queue as queue except ImportError: diff --git a/test/test_params.py b/test/test_params.py index 7cd6f30..dc064fc 100644 --- a/test/test_params.py +++ b/test/test_params.py @@ -29,14 +29,10 @@ from os import path # no fixtures needed import pytest -from secop.datatypes import BoolType -from secop.params import Command, Override, Parameter - sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..'))) - - - +from secop.datatypes import BoolType +from secop.params import Command, Override, Parameter def test_Command(): diff --git a/test/test_parse.py b/test/test_parse.py index ad20d7b..0a5fcdb 100644 --- a/test/test_parse.py +++ b/test/test_parse.py @@ -29,11 +29,9 @@ from os import path import pytest -from secop.parse import Parser - sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..'))) - +from secop.parse import Parser # pylint: disable=redefined-outer-name