From 4cbe2898c0b922174d8a1560fdb97acfc16d03c8 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Wed, 21 Aug 2019 01:01:09 +0200 Subject: [PATCH] Fix usage tests With those tests fixed, everything should pass again --- test/completion/usages.py | 10 +++++----- test/run.py | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/test/completion/usages.py b/test/completion/usages.py index 3e05b7b5..a0acf919 100644 --- a/test/completion/usages.py +++ b/test/completion/usages.py @@ -83,18 +83,18 @@ import 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 -#< (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 -#< (-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 -#< (-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 -#< 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 #< (0, 32), diff --git a/test/run.py b/test/run.py index 8ceeb19f..56dc58cd 100755 --- a/test/run.py +++ b/test/run.py @@ -256,7 +256,10 @@ class IntegrationTestCase(object): def run_usages(self, compare_cb, environment): result = self.script(environment).usages() 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 = [] if not self.correct: positions = []