提交 46ac6c2c 编写于 作者: S Sam Harwell

Fix cases where tests fail to clean up files placed in the Temp folder

上级 f076f791
......@@ -6947,6 +6947,7 @@ public static void Main()
Assert.Contains(source + "(6,16): warning CS0168: The variable 'x' is declared but never used", outWriter.ToString(), StringComparison.Ordinal);
CleanupAllGeneratedFiles(source);
CleanupAllGeneratedFiles(Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(source)), Path.GetFileName(source)));
}
[Fact]
......
......@@ -195,12 +195,11 @@ public void GetMetadata()
// This needs to be in different folder from referencesdir to cause the other code path
// to be triggered for NeedsShadowCopy method
var dir2 = Path.GetTempPath();
string dll2 = Path.Combine(dir2, "a2.dll");
File.WriteAllBytes(dll2, TestResources.MetadataTests.InterfaceAndClass.CSClasses01);
var dir2 = Temp.CreateDirectory();
var dll2 = dir2.CreateFile("a2.dll").WriteAllBytes(TestResources.MetadataTests.InterfaceAndClass.CSClasses01);
Assert.Equal(1, _provider.CacheSize);
var sc3a = _provider.GetMetadataShadowCopy(dll2, MetadataImageKind.Module);
var sc3a = _provider.GetMetadataShadowCopy(dll2.Path, MetadataImageKind.Module);
Assert.Equal(2, _provider.CacheSize);
}
......
......@@ -268,7 +268,7 @@ public static string DumpAssemblyData(IEnumerable<ModuleData> modules, out strin
if (dumpDirectory == null)
{
dumpDirectory = Path.GetTempPath();
dumpDirectory = TempRoot.Root;
try
{
Directory.CreateDirectory(dumpDirectory);
......
......@@ -88,6 +88,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim.Fr
For Each filePath In _projectFilePaths
File.Delete(filePath)
Directory.Delete(Path.GetDirectoryName(filePath))
Next
End Sub
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册