Fix to restore linting of tests directory.

Fix up regressions missed while linting was off and add import order linting for the whole module.

Author: jmchilton

tests/shed_app.py

@@ -1,11 +1,11 @@
 """ Test app to emulate planemo-relevant portions of the
 the ToolShed API... for now :).
 """
-import os
 import json
+import os
 import tarfile
-from uuid import uuid4
 
+from uuid import uuid4
 from xml.etree import ElementTree
 
 from flask import (

tests/shed_app_test_utils.py

@@ -1,17 +1,19 @@
-from collections import namedtuple
 import contextlib
 import shutil
-from tempfile import mkdtemp
 import threading
-from requests import post
 
+from collections import namedtuple
+from tempfile import mkdtemp
+
+from requests import post
 from werkzeug.serving import run_simple
 
+from planemo import network_util
+
 from .shed_app import (
     app,
     InMemoryShedDataModel,
 )
-from planemo import network_util
 
 DEFAULT_OP_TIMEOUT = 2
 

tests/test_cmd_serve.py

@@ -1,20 +1,20 @@
 import functools
 import os
-import time
 import threading
+import time
 import uuid
 
-from planemo.galaxy import api
 from planemo import network_util
+from planemo.galaxy import api
 from planemo.io import kill_pid_file
 
 from .test_utils import (
     CliTestCase,
+    PROJECT_TEMPLATES_DIR,
     skip_if_environ,
     skip_unless_environ,
-    TEST_REPOS_DIR,
-    PROJECT_TEMPLATES_DIR,
     TEST_DATA_DIR,
+    TEST_REPOS_DIR,
 )
 
 TEST_HISTORY_NAME = "Cool History 42"
@@ -106,7 +106,6 @@ def _launch_thread_and_wait(self, func, args=[]):
         assert network_util.wait_net_service("127.0.0.1", port)
 
     def _run(self, serve_args=[]):
-        cat_path = os.path.join(TEST_REPOS_DIR, "single_tool", "cat.xml")
         test_cmd = [
             "serve",
             "--install_galaxy",

tests/test_cmd_shed_serve.py

@@ -1,14 +1,15 @@
 import functools
 import os
-import time
 import threading
+import time
+
+from planemo import network_util
 
 from .test_utils import (
     CliTestCase,
     skip_if_environ,
     TEST_REPOS_DIR,
 )
-from planemo import network_util
 
 
 class ShedServeTestCase(CliTestCase):

tests/test_cmd_test.py

@@ -6,9 +6,9 @@
     assert_exists,
     CliTestCase,
     PROJECT_TEMPLATES_DIR,
-    skip_unless_python_2_7,
     skip_if_environ,
     skip_unless_environ,
+    skip_unless_python_2_7,
     TEST_DATA_DIR,
 )
 

tests/test_command_io.py

@@ -1,7 +1,8 @@
 """Test cases for the CommandIO abstraction in tool_builder."""
 
 from planemo.tool_builder import CommandIO
-from test_utils import assert_equal
+
+from .test_utils import assert_equal
 
 
 def test_simplest_command():

tests/test_dependency_script.py

@@ -1,11 +1,11 @@
-import os
 import glob
+import os
 import tempfile
 
 from .test_utils import (
     CliTestCase,
-    TEST_REPOS_DIR,
     skip_if_environ,
+    TEST_REPOS_DIR,
 )
 
 

tests/test_engines.py

@@ -1,12 +1,12 @@
 """Unit tests for engines and runnables."""
+
 import os
 
 from planemo.engine import engine_context
 from planemo.runnable import for_path
 from planemo.runnable import get_outputs
 
-
-from .test_utils import CWL_DRAFT3_DIR, TEST_DATA_DIR, test_context
+from .test_utils import CWL_DRAFT3_DIR, test_context, TEST_DATA_DIR
 
 A_CWL_TOOL = os.path.join(CWL_DRAFT3_DIR, "cat3-tool.cwl")
 A_CWL_WORKFLOW = os.path.join(CWL_DRAFT3_DIR, "count-lines1-wf.cwl")

tests/test_galaxy_config.py

@@ -2,10 +2,10 @@
 import contextlib
 import os
 
-from .test_utils import TempDirectoryContext, test_context
-
 from planemo.galaxy.config import galaxy_config
 
+from .test_utils import TempDirectoryContext, test_context
+
 
 def test_defaults():
     """Test by default Galaxy files are stored in temp ``config_directory``."""

tests/test_galaxy_serve.py

@@ -5,17 +5,18 @@
 """
 import os
 
+from planemo import network_util
+from planemo import shed
+from planemo.galaxy import galaxy_serve, shed_serve
+from planemo.runnable import for_path
+
 from .test_utils import (
     CliTestCase,
+    PROJECT_TEMPLATES_DIR,
     skip_if_environ,
-    TEST_REPOS_DIR,
     TEST_DATA_DIR,
-    PROJECT_TEMPLATES_DIR,
+    TEST_REPOS_DIR,
 )
-from planemo.runnable import for_path
-from planemo.galaxy import galaxy_serve, shed_serve
-from planemo import network_util
-from planemo import shed
 
 
 class GalaxyServeTestCase(CliTestCase):