* fixed modified PersistentFilesDir check when IsExtractHere is true

* fixed PerfDetectLockmassFunctionTest.cs to delete the lmgt.inf file after running
ProteoWizard · Aug 15, 2024 · badafb1 · badafb1
1 parent fb4ec9f
commit badafb1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/pwiz_tools/Skyline/TestPerf/PerfDetectLockmassFunctionTest.cs b/pwiz_tools/Skyline/TestPerf/PerfDetectLockmassFunctionTest.cs
@@ -18,8 +18,10 @@
  */
 
 
+using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using pwiz.ProteowizardWrapper;
+using pwiz.Skyline.Util;
 using pwiz.SkylineTestUtil;
 
 namespace TestPerf // Note: tests in the "TestPerf" namespace only run when the global RunPerfTests flag is set
@@ -70,6 +72,10 @@ protected override void DoTest()
  var document = WaitForDocumentLoaded(400000);
 
  // If we get here, problem is solved
+
+ // delete lockmass file
+ var lmgtFile = Path.Combine(GetTestPath(TestFilesPersistent[0]), "lmgt.inf");
+ FileEx.SafeDelete(lmgtFile);
  }
  }
 }
diff --git a/pwiz_tools/Skyline/TestUtil/TestFilesDir.cs b/pwiz_tools/Skyline/TestUtil/TestFilesDir.cs
@@ -90,13 +90,15 @@ public TestFilesDir(TestContext testContext, string relativePathZip, string dire
  }
  // where to place persistent (usually large, expensive to extract) files if any
  PersistentFiles = persistentFiles;
+ IsExtractHere = isExtractHere;
  if (PersistentFiles != null)
  PersistentFilesDir = GetExtractDir(Path.GetDirectoryName(relativePathZip), zipBaseName, isExtractHere);
 
  TestContext.ExtractTestFiles(relativePathZip, FullPath, PersistentFiles, PersistentFilesDir);
 
  // record the size of the persistent directory after extracting
- var persistentDirInfo = string.IsNullOrEmpty(PersistentFilesDir) ? null : new DirectoryInfo(PersistentFilesDir);
+ var targetDir = isExtractHere ? Path.Combine(PersistentFilesDir ?? "", directoryName) : PersistentFilesDir;
+ var persistentDirInfo = string.IsNullOrEmpty(PersistentFilesDir) ? null : new DirectoryInfo(targetDir);
  if (persistentDirInfo != null && Directory.Exists(PersistentFilesDir))
  {
  var persistentFileInfos = persistentDirInfo.EnumerateFiles("*", SearchOption.AllDirectories).ToList();
@@ -121,6 +123,7 @@ private static string GetExtractDir(string directoryName, string zipBaseName, bo
  public string PersistentFilesDir { get; private set; }
 
  public string[] PersistentFiles { get; private set; }
+ private bool IsExtractHere { get; }
 
  /// <summary>
  /// The sum of all file sizes in the persistent files dir after extracting the ZIP.
@@ -292,10 +295,12 @@ private void CheckForModifiedPersistentFilesDir()
  GC.WaitForPendingFinalizers();
  GC.Collect();
 
+ var lastDirectoryName = Path.GetFileName(FullPath) ?? "";
+ var targetDir = IsExtractHere ? Path.Combine(PersistentFilesDir ?? "", lastDirectoryName) : PersistentFilesDir;
  List<FileInfo> currentFileInfos;
  try
  {
- var persistentDirInfo = new DirectoryInfo(PersistentFilesDir);
+ var persistentDirInfo = new DirectoryInfo(targetDir);
  currentFileInfos = persistentDirInfo.EnumerateFiles("*", SearchOption.AllDirectories).ToList();
  }
  catch (Exception ex)