10 files changed, 46 insertions, 6 deletions
diff --git a/pylint/test/functional/class_members_py27.py b/pylint/test/functional/class_members_py27.py
index 415a890..97f2962 100644
--- a/pylint/test/functional/class_members_py27.py
+++ b/pylint/test/functional/class_members_py27.py
@@ -1,5 +1,5 @@
 """ Various tests for class members access. """
-# pylint: disable=R0903,print-statement,no-absolute-import, metaclass-assignment,import-error,no-init,missing-docstring
+# pylint: disable=R0903,print-statement,no-absolute-import, metaclass-assignment,import-error,no-init,missing-docstring, wrong-import-order
 from missing import Missing
 class MyClass(object):
     """class docstring"""
diff --git a/pylint/test/functional/deprecated_module_py2.py b/pylint/test/functional/deprecated_module_py2.py
index 399ed87..b0d1865 100644
--- a/pylint/test/functional/deprecated_module_py2.py
+++ b/pylint/test/functional/deprecated_module_py2.py
@@ -1,5 +1,5 @@
 """Test deprecated modules."""
-# pylint: disable=unused-import,no-name-in-module,import-error
+# pylint: disable=unused-import,no-name-in-module,import-error,ungrouped-imports
 
 import Bastion # [deprecated-module]
 import rexec # [deprecated-module]
diff --git a/pylint/test/functional/logging_format_interpolation.py b/pylint/test/functional/logging_format_interpolation.py
index 85117bf..5432d33 100644
--- a/pylint/test/functional/logging_format_interpolation.py
+++ b/pylint/test/functional/logging_format_interpolation.py
@@ -1,4 +1,4 @@
-# pylint: disable=E1101, no-absolute-import, import-error,line-too-long, missing-docstring
+# pylint: disable=E1101, no-absolute-import, import-error,line-too-long, missing-docstring,wrong-import-order
 
 try:
     import __builtin__ as builtins
diff --git a/pylint/test/functional/no_name_in_module.py b/pylint/test/functional/no_name_in_module.py
index ba2ee9c..712611f 100644
--- a/pylint/test/functional/no_name_in_module.py
+++ b/pylint/test/functional/no_name_in_module.py
@@ -1,4 +1,4 @@
-#pylint: disable=W0401,W0611,no-absolute-import,invalid-name,import-error,bare-except,broad-except
+#pylint: disable=W0401,W0611,no-absolute-import,invalid-name,import-error,bare-except,broad-except,wrong-import-order,ungrouped-imports
 """check unexistant names imported are reported"""
 from __future__ import print_function
 
diff --git a/pylint/test/functional/ungrouped_imports.py b/pylint/test/functional/ungrouped_imports.py
new file mode 100644
index 0000000..9626062
--- /dev/null
+++ b/pylint/test/functional/ungrouped_imports.py
@@ -0,0 +1,20 @@
+"""Checks import order rule"""
+# pylint: disable=unused-import,relative-import,wrong-import-order,using-constant-test
+
+import six
+import logging.config
+import os.path
+from astroid import are_exclusive
+import logging  # [ungrouped-imports]
+import unused_import
+try:
+    import os  # [ungrouped-imports]
+except ImportError:
+    pass
+from os import pardir
+import scipy
+from os import sep
+import astroid  # [ungrouped-imports]
+if True:
+    import logging.handlers  # [ungrouped-imports]
+from os.path import join  # [ungrouped-imports]
diff --git a/pylint/test/functional/ungrouped_imports.txt b/pylint/test/functional/ungrouped_imports.txt
new file mode 100644
index 0000000..c29bb18
--- /dev/null
+++ b/pylint/test/functional/ungrouped_imports.txt
@@ -0,0 +1,5 @@
+ungrouped-imports:8::Imports from package logging are not grouped
+ungrouped-imports:11::Imports from package os are not grouped
+ungrouped-imports:17::Imports from package astroid are not grouped
+ungrouped-imports:19::Imports from package logging are not grouped
+ungrouped-imports:20::Imports from package os are not grouped
diff --git a/pylint/test/functional/unpacking_non_sequence.py b/pylint/test/functional/unpacking_non_sequence.py
index 1e5de23..c03b63d 100644
--- a/pylint/test/functional/unpacking_non_sequence.py
+++ b/pylint/test/functional/unpacking_non_sequence.py
@@ -3,8 +3,8 @@
 # pylint: disable=too-few-public-methods, invalid-name, attribute-defined-outside-init, unused-variable, no-absolute-import
 # pylint: disable=using-constant-test, no-init
 from os import rename as nonseq_func
-from functional.unpacking import nonseq
 from six import with_metaclass
+from functional.unpacking import nonseq
 
 __revision__ = 0
 
diff --git a/pylint/test/functional/unsubscriptable_value.py b/pylint/test/functional/unsubscriptable_value.py
index 221bd17..64cafaf 100644
--- a/pylint/test/functional/unsubscriptable_value.py
+++ b/pylint/test/functional/unsubscriptable_value.py
@@ -3,7 +3,7 @@ Checks that value used in a subscript supports subscription
 (i.e. defines __getitem__ method).
 """
 # pylint: disable=missing-docstring,pointless-statement,expression-not-assigned
-# pylint: disable=too-few-public-methods,import-error,invalid-name
+# pylint: disable=too-few-public-methods,import-error,invalid-name,wrong-import-order
 import six
 
 # primitives
diff --git a/pylint/test/functional/wrong_import_order.py b/pylint/test/functional/wrong_import_order.py
new file mode 100644
index 0000000..9fc3996
--- /dev/null
+++ b/pylint/test/functional/wrong_import_order.py
@@ -0,0 +1,11 @@
+"""Checks import order rule"""
+# pylint: disable=unused-import,relative-import,ungrouped-imports
+
+import six
+import os.path  # [wrong-import-order]
+from astroid import are_exclusive
+import sys  # [wrong-import-order]
+import datetime  # [wrong-import-order]
+import unused_import
+import scipy  # [wrong-import-order]
+import astroid
diff --git a/pylint/test/functional/wrong_import_order.txt b/pylint/test/functional/wrong_import_order.txt
new file mode 100644
index 0000000..537355c
--- /dev/null
+++ b/pylint/test/functional/wrong_import_order.txt
@@ -0,0 +1,4 @@
+wrong-import-order:5::standard import "import os.path" comes before "import six"
+wrong-import-order:7::standard import "import sys" comes before "import six"
+wrong-import-order:8::standard import "import datetime" comes before "import six"
+wrong-import-order:10::external import "import scipy" comes before "from astroid import are_exclusive"