Make refactoring tests a bit clearer

test/refactor.py

@@ -44,8 +44,8 @@ class RefactoringCase(object):
 
 
 def _collect_file_tests(code, path, lines_to_execute):
-    r = r'^# -{5} ?([^\n]*)\n((?:(?!\n# \+{5}).)*\n)' \
-        r'# \+{5}\n((?:(?!\n# -{5}).)*\n)'
+    r = r'^# -{5,} ?([^\n]*)\n((?:(?!\n# \+{5,}).)*\n)' \
+        r'# \+{5,}\n((?:(?!\n# -{5,}).)*\n)'
     for match in re.finditer(r, code, re.DOTALL | re.MULTILINE):
         name = match.group(1).strip()
         first = match.group(2)

test/refactor/rename.py

@@ -3,7 +3,7 @@ Test coverage for renaming is mostly being done by testing
 `Script.get_references`.
 """
 
-# ----- simple
+# -------------------------------------------------- simple
 def test1():
     #? 7 blabla
     test1()
@@ -21,7 +21,7 @@ def test1():
      AssertionError
 -    return test1, test1.not_existing
 +    return blabla, blabla.not_existing
-# ----- different-scopes
+# -------------------------------------------------- different-scopes
 def x():
     #? 7 v
     some_var = 3
@@ -29,7 +29,7 @@ def x():
 def y():
     some_var = 3
     some_var
-# +++++
+# ++++++++++++++++++++++++++++++++++++++++++++++++++
 --- /home/dave/source/jedi/test/refactor/rename.py
 +++ /home/dave/source/jedi/test/refactor/rename.py
 @@ -1,7 +1,7 @@
@@ -42,11 +42,11 @@ def y():
  def y():
      some_var = 3
      some_var
-# ----- import
+# -------------------------------------------------- import
 from import_tree.mod import foobar
 #? 0 renamed
 foobar
-# +++++
+# ++++++++++++++++++++++++++++++++++++++++++++++++++
 --- /home/dave/source/jedi/test/refactor/import_tree/mod.py
 +++ /home/dave/source/jedi/test/refactor/import_tree/mod.py
 @@ -1,2 +1,2 @@
@@ -60,11 +60,11 @@ foobar
  #? 0 renamed
 -foobar
 +renamed
-# ----- module
+# -------------------------------------------------- module
 from import_tree import mod
 #? 0 renamedm
 mod
-# +++++
+# ++++++++++++++++++++++++++++++++++++++++++++++++++
 rename from /home/dave/source/jedi/test/refactor/import_tree/mod.py
 rename to /home/dave/source/jedi/test/refactor/import_tree/renamedm.py
 --- /home/dave/source/jedi/test/refactor/rename.py