From c1eefae5f5000b761b04e9debd0e0c5683f62b59 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Wed, 9 Sep 2020 13:43:22 +0200
Subject: [PATCH] [backend][tests] Pre-commit cleanup

---
 beat/web/backend/tests/common.py         | 24 +++++++--------
 beat/web/backend/tests/test_cache.py     |  2 +-
 beat/web/backend/tests/test_helpers.py   | 37 ++++++++++--------------
 beat/web/backend/tests/test_scheduler.py | 19 +++++-------
 beat/web/backend/tests/test_setup.py     | 13 ++++-----
 5 files changed, 39 insertions(+), 56 deletions(-)

diff --git a/beat/web/backend/tests/common.py b/beat/web/backend/tests/common.py
index eb9a69aa5..6c0cf7f4e 100755
--- a/beat/web/backend/tests/common.py
+++ b/beat/web/backend/tests/common.py
@@ -27,27 +27,23 @@
 
 import os
 
-import beat.core.hash
-
-from django.test import TestCase
 from django.conf import settings
+from django.test import TestCase
+
+import beat.core.hash
+from beat.core.data import CachedDataSink
+from beat.core.database import Database
+from beat.core.dataformat import DataFormat
 
-from ...utils.management.commands import install
-from ...experiments.models import Block
 from ...algorithms.models import Algorithm
 from ...common.testutils import tearDownModule  # noqa test runner will call it
-
+from ...experiments.models import Block
+from ...utils.management.commands import install
+from ..management.commands import qsetup
+from ..models import Environment
 from ..models import Queue
 from ..models import Worker
-from ..models import Environment
-
 from ..utils import setup_backend
-from ..management.commands import qsetup
-
-from beat.core.dataformat import DataFormat
-from beat.core.data import CachedDataSink
-from beat.core.database import Database
-
 
 # ----------------------------------------------------------
 
diff --git a/beat/web/backend/tests/test_cache.py b/beat/web/backend/tests/test_cache.py
index a83e179bb..95744c9ea 100755
--- a/beat/web/backend/tests/test_cache.py
+++ b/beat/web/backend/tests/test_cache.py
@@ -26,9 +26,9 @@
 ###############################################################################
 
 import os
-import time
 import shutil
 import tempfile
+import time
 
 from django.core import management
 from django.test import TestCase
diff --git a/beat/web/backend/tests/test_helpers.py b/beat/web/backend/tests/test_helpers.py
index 572deb6aa..c65c3ed88 100755
--- a/beat/web/backend/tests/test_helpers.py
+++ b/beat/web/backend/tests/test_helpers.py
@@ -25,39 +25,34 @@
 #                                                                             #
 ###############################################################################
 
-import beat.core.hash
-
 import os
 
 from django.conf import settings
 
-from ...experiments.models import Experiment
+import beat.core.hash
+
+from ...common.testutils import tearDownModule  # noqa test runner will call it
 from ...experiments.models import Block
 from ...experiments.models import CachedFile
-from ...common.testutils import tearDownModule  # noqa test runner will call it
-
-from ..models import Job
-from ..models import JobSplit
-from ..models import Worker
-from ..models import Queue
-
-from ..helpers import schedule_experiment
-from ..helpers import cancel_experiment
-from ..helpers import split_new_jobs
-from ..helpers import process_newly_cancelled_experiments
-from ..helpers import is_cache_complete
+from ...experiments.models import Experiment
 from ..helpers import assign_splits_to_workers
+from ..helpers import cancel_experiment
 from ..helpers import get_configuration_for_split
-from ..helpers import on_split_started
+from ..helpers import is_cache_complete
+from ..helpers import on_split_cancelled
 from ..helpers import on_split_done
 from ..helpers import on_split_fail
-from ..helpers import on_split_cancelled
-
+from ..helpers import on_split_started
+from ..helpers import process_newly_cancelled_experiments
+from ..helpers import schedule_experiment
+from ..helpers import split_new_jobs
+from ..models import Job
+from ..models import JobSplit
+from ..models import Queue
+from ..models import Worker
 from ..utils import setup_backend
-
-from .common import BaseBackendTestCase
 from .common import ONE_QUEUE_TWO_WORKERS
-
+from .common import BaseBackendTestCase
 
 # ----------------------------------------------------------
 
diff --git a/beat/web/backend/tests/test_scheduler.py b/beat/web/backend/tests/test_scheduler.py
index 194929e40..860d120e8 100755
--- a/beat/web/backend/tests/test_scheduler.py
+++ b/beat/web/backend/tests/test_scheduler.py
@@ -26,29 +26,24 @@
 ###############################################################################
 
 import os
-
-from time import time
 from time import sleep
+from time import time
 from unittest import skipIf
 
 from django.conf import settings
 from django.test import TransactionTestCase
 
-from ...experiments.models import Experiment
-from ...experiments.models import Block
 from ...common.testutils import tearDownModule  # noqa test runner will call it
-
-from ..models import Worker
-
-from ..utils import setup_backend
-from ..helpers import schedule_experiment
+from ...experiments.models import Block
+from ...experiments.models import Experiment
 from ..helpers import cancel_experiment
+from ..helpers import schedule_experiment
 from ..local_scheduler import start_scheduler
 from ..local_scheduler import start_worker
-
-from .common import BackendUtilitiesMixin
+from ..models import Worker
+from ..utils import setup_backend
 from .common import ONE_QUEUE_TWO_WORKERS
-
+from .common import BackendUtilitiesMixin
 
 # ----------------------------------------------------------
 
diff --git a/beat/web/backend/tests/test_setup.py b/beat/web/backend/tests/test_setup.py
index 7399aee34..029d2c407 100755
--- a/beat/web/backend/tests/test_setup.py
+++ b/beat/web/backend/tests/test_setup.py
@@ -29,18 +29,15 @@ import collections
 
 from django.core import management
 
-from .common import BaseBackendTestCase
-
+from ...common.testutils import tearDownModule  # noqa test runner will call it
+from ...experiments.models import Experiment
+from ..management.commands import qsetup
 from ..models import Queue
-from ..models import Worker
 from ..models import Slot
+from ..models import Worker
 from ..utils import dump_backend
 from ..utils import setup_backend
-from ..management.commands import qsetup
-
-from ...experiments.models import Experiment
-from ...common.testutils import tearDownModule  # noqa test runner will call it
-
+from .common import BaseBackendTestCase
 
 # Example configuration with 3 queues with an increasing amount of resources
 # running on the same host
-- 
GitLab