Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Fix #157: PackageRelativeImportPep328 test fails #275

Merged
Alexander Sher (AlexanderSher) merged 1 commit into from
Oct 17, 2018
Merged

Fix #157: PackageRelativeImportPep328 test fails #275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/Analysis/Engine/Test/AnalysisTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4115,16 +4115,15 @@ public async Task PackageRelativeImport() {
}
}

[DataRow("from .moduleY import spam", "spam")]
[DataRow("from .moduleY import spam as ham", "ham")]
[DataRow("from . import moduleY", "moduleY.spam")]
[DataRow("from ..subpackage1 import moduleY", "moduleY.spam")]
[DataRow("from ..subpackage2.moduleZ import eggs", "eggs")]
[DataRow("from ..moduleA import foo", "foo")]
[DataRow("from ...package import bar", "bar")]
[DataRow("from .moduleY import spam", "spam", null)]
[DataRow("from .moduleY import spam as ham", "ham", null)]
[DataRow("from . import moduleY", "moduleY", "spam")]
[DataRow("from ..subpackage1 import moduleY", "moduleY", "spam")]
[DataRow("from ..subpackage2.moduleZ import eggs", "eggs", null)]
[DataRow("from ..moduleA import foo", "foo", null)]
[DataRow("from ...package import bar", "bar", null)]
[DataTestMethod, Priority(0)]
[Ignore("https://github.com/Microsoft/python-language-server/issues/157")]
public async Task PackageRelativeImportPep328(string subpackageModuleXContent, string variable) {
public async Task PackageRelativeImportPep328(string subpackageModuleXContent, string variable, string member) {
var initContent = "def bar():\n pass\n";
var moduleAContent = "def foo():\n pass\n";
var subpackageModuleYContent = "def spam():\n pass\n";
Expand Down Expand Up @@ -4154,7 +4153,12 @@ public async Task PackageRelativeImportPep328(string subpackageModuleXContent, s
await server.WaitForCompleteAnalysisAsync(CancellationToken.None);
var analysisX = await server.GetAnalysisAsync(subpackageModuleXUri);

analysisX.Should().HaveVariable(variable).OfType(BuiltinTypeId.Function);
if (member != null) {
analysisX.Should().HaveVariable(variable).WithValue<IModule>()
.WithMemberOfType(member, PythonMemberType.Function);
} else {
analysisX.Should().HaveVariable(variable).OfType(BuiltinTypeId.Function);
}
}
}

Expand Down