From f0b59a7015b43c7c2bd4d683843103bbf22803a8 Mon Sep 17 00:00:00 2001 From: Samuel Gaist <samuel.gaist@idiap.ch> Date: Wed, 9 Sep 2020 09:49:56 +0200 Subject: [PATCH] [algorithms][tests] Pre-commit cleanup --- beat/web/algorithms/tests/core.py | 10 ++++------ beat/web/algorithms/tests/tests.py | 4 +--- beat/web/algorithms/tests/tests_api.py | 15 ++++++--------- beat/web/algorithms/tests/tests_team.py | 6 ++---- beat/web/algorithms/tests/tests_user.py | 3 +-- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/beat/web/algorithms/tests/core.py b/beat/web/algorithms/tests/core.py index 122fb7c72..3ae5dbc4c 100755 --- a/beat/web/algorithms/tests/core.py +++ b/beat/web/algorithms/tests/core.py @@ -30,19 +30,17 @@ import os import shutil import simplejson as json - -from django.contrib.auth.models import User from django.conf import settings +from django.contrib.auth.models import User + +from beat.core.algorithm import Storage -from ...dataformats.models import DataFormat from ...common.testutils import BaseTestCase from ...common.testutils import tearDownModule # noqa test runner will call it +from ...dataformats.models import DataFormat from ...team.models import Team - from ..models import Algorithm -from beat.core.algorithm import Storage - TEST_PWD = "1234" diff --git a/beat/web/algorithms/tests/tests.py b/beat/web/algorithms/tests/tests.py index b33e28cf7..1eb1ed26d 100644 --- a/beat/web/algorithms/tests/tests.py +++ b/beat/web/algorithms/tests/tests.py @@ -27,11 +27,9 @@ from django.contrib.auth.models import User -from ...libraries.models import Library from ...common.testutils import tearDownModule # noqa test runner will call it - +from ...libraries.models import Library from ..models import Algorithm - from .core import AlgorithmsBaseTestCase diff --git a/beat/web/algorithms/tests/tests_api.py b/beat/web/algorithms/tests/tests_api.py index 85d8e1c3d..327564997 100755 --- a/beat/web/algorithms/tests/tests_api.py +++ b/beat/web/algorithms/tests/tests_api.py @@ -27,21 +27,18 @@ import simplejson as json - -from django.contrib.auth.models import User from django.conf import settings -from django.urls import reverse +from django.contrib.auth.models import User from django.core.files.uploadedfile import SimpleUploadedFile - -from ...dataformats.models import DataFormat -from ...common.testutils import tearDownModule # noqa test runner will call it -from ...common.testutils import get_algorithms_from_data -from ...code.models import Code +from django.urls import reverse import beat.core.algorithm +from ...code.models import Code +from ...common.testutils import get_algorithms_from_data +from ...common.testutils import tearDownModule # noqa test runner will call it +from ...dataformats.models import DataFormat from ..models import Algorithm - from .core import AlgorithmsAPIBase diff --git a/beat/web/algorithms/tests/tests_team.py b/beat/web/algorithms/tests/tests_team.py index 163413208..c7567a172 100644 --- a/beat/web/algorithms/tests/tests_team.py +++ b/beat/web/algorithms/tests/tests_team.py @@ -27,12 +27,10 @@ from django.contrib.auth.models import User -from ...team.models import Team -from ...dataformats.models import DataFormat from ...common.testutils import tearDownModule # noqa test runner will call it - +from ...dataformats.models import DataFormat +from ...team.models import Team from ..models import Algorithm - from .core import AlgorithmsAccessibilityFunctionsBase diff --git a/beat/web/algorithms/tests/tests_user.py b/beat/web/algorithms/tests/tests_user.py index c0e2e1294..4b35763a6 100644 --- a/beat/web/algorithms/tests/tests_user.py +++ b/beat/web/algorithms/tests/tests_user.py @@ -26,10 +26,9 @@ ############################################################################### +from ...common.testutils import tearDownModule # noqa test runner will call it from ..models import Algorithm - from .core import AlgorithmsAccessibilityFunctionsBase -from ...common.testutils import tearDownModule # noqa test runner will call it class NotSharedAlgorithm_CheckAccessibilityFunction( -- GitLab