Fix usage tests

With those tests fixed, everything should pass again
This commit is contained in:
Dave Halter
2019-08-21 01:01:09 +02:00
parent 8a2b7f18cd
commit 4cbe2898c0
2 changed files with 9 additions and 6 deletions

View File

@@ -83,18 +83,18 @@ import module_not_exists
module_not_exists module_not_exists
#< ('rename1', 1,0), (0,24), (3,0), (6,17), ('rename2', 4,17), (11,17), (14,17), ('imports', 72, 16) #< ('import_tree.rename1', 1,0), (0,24), (3,0), (6,17), ('import_tree.rename2', 4,17), (11,17), (14,17), ('imports', 72, 16)
from import_tree import rename1 from import_tree import rename1
#< (0,8), ('rename1',3,0), ('rename2',4,32), ('rename2',6,0), (3,32), (8,32), (5,0) #< (0,8), ('import_tree.rename1',3,0), ('import_tree.rename2',4,32), ('import_tree.rename2',6,0), (3,32), (8,32), (5,0)
rename1.abc rename1.abc
#< (-3,8), ('rename1', 3,0), ('rename2', 4,32), ('rename2', 6,0), (0,32), (5,32), (2,0) #< (-3,8), ('import_tree.rename1', 3,0), ('import_tree.rename2', 4,32), ('import_tree.rename2', 6,0), (0,32), (5,32), (2,0)
from import_tree.rename1 import abc from import_tree.rename1 import abc
#< (-5,8), (-2,32), ('rename1', 3,0), ('rename2', 4,32), ('rename2', 6,0), (0,0), (3,32) #< (-5,8), (-2,32), ('import_tree.rename1', 3,0), ('import_tree.rename2', 4,32), ('import_tree.rename2', 6,0), (0,0), (3,32)
abc abc
#< 20 ('rename1', 1,0), ('rename2', 4,17), (-11,24), (-8,0), (-5,17), (0,17), (3,17), ('imports', 72, 16) #< 20 ('import_tree.rename1', 1,0), ('import_tree.rename2', 4,17), (-11,24), (-8,0), (-5,17), (0,17), (3,17), ('imports', 72, 16)
from import_tree.rename1 import abc from import_tree.rename1 import abc
#< (0, 32), #< (0, 32),

View File

@@ -256,7 +256,10 @@ class IntegrationTestCase(object):
def run_usages(self, compare_cb, environment): def run_usages(self, compare_cb, environment):
result = self.script(environment).usages() result = self.script(environment).usages()
self.correct = self.correct.strip() self.correct = self.correct.strip()
compare = sorted((r.module_name, r.line, r.column) for r in result) compare = sorted(
(re.sub(r'^test\.completion\.', '', r.module_name), r.line, r.column)
for r in result
)
wanted = [] wanted = []
if not self.correct: if not self.correct:
positions = [] positions = []