Move some tests that targeted completion on import statements into a separate file.

test/completion/imports.py

@@ -69,16 +69,6 @@ def scope_nested2():
     #? ['rename1']
     import_tree.rename1
 
-def from_names():
-    #? ['mod1']
-    from import_tree.pkg.
-    #? ['path']
-    from os.
-
-def builtin_test():
-    #? ['math']
-    import math
-
 def scope_from_import_variable():
     """
     All of them shouldn't work, because "fake" imports don't work in python
@@ -136,9 +126,6 @@ import os
 #? ['dirname']
 os.path.dirname
 
-#? os.path.join
-from os.path import join
-
 from os.path import (
     expanduser
 )
@@ -188,28 +175,6 @@ def func_with_import():
 #? ['sleep']
 func_with_import().sleep
 
-# -----------------
-# completions within imports
-# -----------------
-
-#? ['sqlite3']
-import sqlite3
-
-#? ['classes']
-import classes
-
-#? ['timedelta']
-from datetime import timedel
-
-# should not be possible, because names can only be looked up 1 level deep.
-#? []
-from datetime.timedelta import resolution
-#? []
-from datetime.timedelta import 
-
-#? ['Cursor']
-from sqlite3 import Cursor
-
 # -----------------
 # relative imports
 # -----------------
@@ -249,62 +214,10 @@ mod1.
 #? str()
 imp_tree.a
 
-#? ['some_variable']
-from . import some_variable
-#? ['arrays']
-from . import arrays
-#? []
-from . import import_tree as ren
-
-
-# -----------------
-# special positions -> edge cases
-# -----------------
-import datetime
-
-#? 6 datetime
-from datetime.time import time
-
-#? []
-import datetime.
-#? []
-import datetime.date
-
-#? 18 ['import']
-from import_tree. import pkg
-#? 17 ['mod1', 'mod2', 'random', 'pkg', 'rename1', 'rename2', 'recurse_class1', 'recurse_class2']
-from import_tree. import pkg
-
-#? 18 ['pkg']
-from import_tree.p import pkg
-
-#? 17 ['import_tree']
-from .import_tree import 
-#? 10 ['run']
-from ..run import 
-#? ['run']
-from .. import run
-
-#? []
-from not_a_module import 
-
 # self import
 # this can cause recursions
 from imports import *
 
-#137
-import json
-#? 23 json.dump
-from json import load, dump
-#? 17 json.load
-from json import load, dump
-# without the from clause:
-import json, datetime
-#? 7 json
-import json, datetime
-#? 13 datetime
-import json, datetime
-
 # -----------------
 # packages
 # -----------------

test/completion/on_import.py

@@ -0,0 +1,88 @@
+def from_names():
+    #? ['mod1']
+    from import_tree.pkg.
+    #? ['path']
+    from os.
+
+def builtin_test():
+    #? ['math']
+    import math
+
+# -----------------
+# completions within imports
+# -----------------
+
+#? ['sqlite3']
+import sqlite3
+
+#? ['classes']
+import classes
+
+#? ['timedelta']
+from datetime import timedel
+
+# should not be possible, because names can only be looked up 1 level deep.
+#? []
+from datetime.timedelta import resolution
+#? []
+from datetime.timedelta import 
+
+#? ['Cursor']
+from sqlite3 import Cursor
+
+#? ['some_variable']
+from . import some_variable
+#? ['arrays']
+from . import arrays
+#? []
+from . import import_tree as ren
+
+import os
+#? os.path.join
+from os.path import join
+
+# -----------------
+# special positions -> edge cases
+# -----------------
+import datetime
+
+#? 6 datetime
+from datetime.time import time
+
+#? []
+import datetime.
+#? []
+import datetime.date
+
+#? 18 ['import']
+from import_tree. import pkg
+#? 17 ['mod1', 'mod2', 'random', 'pkg', 'rename1', 'rename2', 'recurse_class1', 'recurse_class2']
+from import_tree. import pkg
+
+#? 18 ['pkg']
+from import_tree.p import pkg
+
+#? 17 ['import_tree']
+from .import_tree import 
+#? 10 ['run']
+from ..run import 
+#? ['run']
+from .. import run
+
+#? []
+from not_a_module import 
+
+
+#137
+import json
+#? 23 json.dump
+from json import load, dump
+#? 17 json.load
+from json import load, dump
+# without the from clause:
+import json, datetime
+#? 7 json
+import json, datetime
+#? 13 datetime
+import json, datetime
+