diff --git a/tests/integration/test_aggregator.py b/tests/integration/test_aggregator.py index 3f64fa3..2186c35 100644 --- a/tests/integration/test_aggregator.py +++ b/tests/integration/test_aggregator.py @@ -1,12 +1,12 @@ """Test aggregation of config files and command-line options.""" import os -import pytest - from flake8.main import cli from flake8.options import aggregator from flake8.options import manager +import pytest + CLI_SPECIFIED_CONFIG = 'tests/fixtures/config_files/cli-specified.ini' diff --git a/tests/unit/test_config_file_finder.py b/tests/unit/test_config_file_finder.py index 6ac1d16..58009f7 100644 --- a/tests/unit/test_config_file_finder.py +++ b/tests/unit/test_config_file_finder.py @@ -7,11 +7,12 @@ except ImportError: import os import sys -import mock -import pytest - from flake8.options import config +import mock + +import pytest + CLI_SPECIFIED_FILEPATH = 'tests/fixtures/config_files/cli-specified.ini' diff --git a/tests/unit/test_merged_config_parser.py b/tests/unit/test_merged_config_parser.py index 2c4c5fd..c64cae6 100644 --- a/tests/unit/test_merged_config_parser.py +++ b/tests/unit/test_merged_config_parser.py @@ -1,12 +1,13 @@ """Unit tests for flake8.options.config.MergedConfigParser.""" import os -import mock -import pytest - from flake8.options import config from flake8.options import manager +import mock + +import pytest + @pytest.fixture def optmanager(): diff --git a/tests/unit/test_notifier.py b/tests/unit/test_notifier.py index 6a162cf..8c001da 100644 --- a/tests/unit/test_notifier.py +++ b/tests/unit/test_notifier.py @@ -1,8 +1,8 @@ """Unit tests for the Notifier object.""" -import pytest - from flake8.plugins import notifier +import pytest + class _Listener(object): def __init__(self, error_code): diff --git a/tests/unit/test_option.py b/tests/unit/test_option.py index 67e2255..45f9be7 100644 --- a/tests/unit/test_option.py +++ b/tests/unit/test_option.py @@ -1,9 +1,10 @@ """Unit tests for flake8.options.manager.Option.""" -import mock -import pytest - from flake8.options import manager +import mock + +import pytest + def test_to_optparse(): """Test conversion to an optparse.Option class.""" diff --git a/tests/unit/test_option_manager.py b/tests/unit/test_option_manager.py index 99c5d18..1ba5442 100644 --- a/tests/unit/test_option_manager.py +++ b/tests/unit/test_option_manager.py @@ -2,10 +2,10 @@ import optparse import os -import pytest - from flake8.options import manager +import pytest + TEST_VERSION = '3.0.0b1' diff --git a/tests/unit/test_plugin.py b/tests/unit/test_plugin.py index 01454a1..0f6eec1 100644 --- a/tests/unit/test_plugin.py +++ b/tests/unit/test_plugin.py @@ -1,10 +1,11 @@ """Tests for flake8.plugins.manager.Plugin.""" -import mock -import pytest - from flake8 import exceptions from flake8.plugins import manager +import mock + +import pytest + def test_load_plugin_fallsback_on_old_setuptools(): """Verify we fallback gracefully to on old versions of setuptools.""" diff --git a/tests/unit/test_plugin_manager.py b/tests/unit/test_plugin_manager.py index 8991b96..5a50386 100644 --- a/tests/unit/test_plugin_manager.py +++ b/tests/unit/test_plugin_manager.py @@ -1,8 +1,8 @@ """Tests for flake8.plugins.manager.PluginManager.""" -import mock - from flake8.plugins import manager +import mock + def create_entry_point_mock(name): """Create a mocked EntryPoint.""" diff --git a/tests/unit/test_plugin_type_manager.py b/tests/unit/test_plugin_type_manager.py index f64e472..271ebc0 100644 --- a/tests/unit/test_plugin_type_manager.py +++ b/tests/unit/test_plugin_type_manager.py @@ -1,12 +1,13 @@ """Tests for flake8.plugins.manager.PluginTypeManager.""" import collections -import mock -import pytest - from flake8 import exceptions from flake8.plugins import manager +import mock + +import pytest + TEST_NAMESPACE = "testing.plugin-type-manager" diff --git a/tests/unit/test_style_guide.py b/tests/unit/test_style_guide.py index 03bb341..973281b 100644 --- a/tests/unit/test_style_guide.py +++ b/tests/unit/test_style_guide.py @@ -1,11 +1,12 @@ """Tests for the flake8.style_guide.StyleGuide class.""" import optparse +from flake8 import style_guide from flake8.formatting import base from flake8.plugins import notifier -from flake8 import style_guide import mock + import pytest diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 28b8e02..d69d939 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -1,12 +1,13 @@ """Tests for flake8's utils module.""" import os + +from flake8 import utils +from flake8.plugins import manager as plugin_manager + import mock import pytest -from flake8.plugins import manager as plugin_manager -from flake8 import utils - RELATIVE_PATHS = ["flake8", "pep8", "pyflakes", "mccabe"]