Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing WindowsPackTests

Browse Source
This commit is contained in:
Kevin Bost
2025-09-20 20:55:28 -07:00
parent 796689c973
commit ae5d2d9707
3 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/TestApp/Program.cs
View File

@@ -19,21 +19,21 @@ try {
.SetAutoApplyOnStartup(shouldAutoUpdate)
.OnFirstRun(
(v) => {
debugFile("firstrun", v.ToString());
debugFile("firstrun", v.ToString(), "OnFirstRun");
Console.WriteLine("was first run");
shouldExit = true;
})
.OnRestarted(
(v) => {
debugFile("restarted", v.ToString() + "," + String.Join(",", args));
debugFile("restarted", v.ToString() + "," + String.Join(",", args), "OnRestarted");
Console.WriteLine("app just restarted");
shouldExit = true;
})
.SetLocator(locator)
.OnAfterInstallFastCallback((v) => debugFile("args.txt", String.Join(" ", args)))
.OnBeforeUpdateFastCallback((v) => debugFile("args.txt", String.Join(" ", args)))
.OnAfterUpdateFastCallback((v) => debugFile("args.txt", String.Join(" ", args)))
.OnBeforeUninstallFastCallback((v) => debugFile("args.txt", String.Join(" ", args)))
.OnAfterInstallFastCallback((v) => debugFile("args.txt", String.Join(" ", args), "OnAfterInstallFastCallback"))
.OnBeforeUpdateFastCallback((v) => debugFile("args.txt", String.Join(" ", args), "OnBeforeUpdateFastCallback"))
.OnAfterUpdateFastCallback((v) => debugFile("args.txt", String.Join(" ", args), "OnAfterUpdateFastCallback"))
.OnBeforeUninstallFastCallback((v) => debugFile("args.txt", String.Join(" ", args), "OnBeforeUninstallFastCallback"))
.Run();
if (shouldAutoUpdate) {
@@ -77,7 +77,7 @@ try {
return -1;
}
um.DownloadUpdates(info, (x) => Console.WriteLine(x));
um.DownloadUpdates(info, Console.WriteLine);
return 0;
}
@@ -89,7 +89,7 @@ try {
}
Console.WriteLine("applying...");
um.ApplyUpdatesAndRestart((VelopackAsset) null, new[] { "test", "args !!" });
um.ApplyUpdatesAndRestart(null, ["test", "args !!"]);
return 0;
}
}
@@ -102,8 +102,8 @@ try {
Console.WriteLine("Invalid args: " + String.Join(", ", args));
return -1;
void debugFile(string name, string message)
static void debugFile(string name, string message, string hook)
{
var path = Path.Combine(AppContext.BaseDirectory, "..", name);
File.AppendAllText(path, message + Environment.NewLine);
File.AppendAllText(path, $"{hook}: {message}{Environment.NewLine}");
}

44
test/Velopack.Packaging.Tests/WindowsPackTests.cs
View File

@@ -1,4 +1,4 @@
using System.Diagnostics;
using System.Diagnostics;
using System.Globalization;
using System.Runtime.Versioning;
using System.Xml.Linq;
@@ -32,6 +32,24 @@ public class WindowsPackTests
return new WindowsPackCommandRunner(logger, console);
}
private static string GetLogFilePath(string appId)
{
return Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
"velopack",
appId,
"Velopack.log");
}
private static string GetPackagesPath(string appId)
{
return Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
"velopack",
appId,
"packages");
}
[SkippableFact]
public void PackBuildValidPackageMostOptions()
{
@@ -284,8 +302,8 @@ public class WindowsPackTests
// move package into local packages dir
var fileName = $"{id}-2.0.0-full.nupkg";
var mvFrom = Path.Combine(releaseDir, fileName);
var mvTo = Path.Combine(installDir, "packages", fileName);
File.Copy(mvFrom, mvTo);
var mvTo = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "velopack", id, "packages", fileName);
File.Copy(mvFrom, mvTo, true);
RunCoveredDotnet(appPath, ["--autoupdate"], installDir, logger, exitCode: null);
@@ -391,11 +409,12 @@ public class WindowsPackTests
var argsPath = Path.Combine(installDir, "args.txt");
Assert.True(File.Exists(argsPath));
Assert.Equal("--veloapp-install 1.0.0", File.ReadAllText(argsPath).Trim());
string contents = File.ReadAllText(argsPath).Trim();
Assert.Equal("OnAfterInstallFastCallback: --veloapp-install 1.0.0", contents);
var firstRun = Path.Combine(installDir, "firstrun");
Assert.True(File.Exists(argsPath));
Assert.Equal("1.0.0", File.ReadAllText(firstRun).Trim());
Assert.Equal("OnFirstRun: 1.0.0", File.ReadAllText(firstRun).Trim());
// pack v2
await PackTestApp(id, "2.0.0", "version 2 test", releaseDir, logger);
@@ -406,7 +425,7 @@ public class WindowsPackTests
Thread.Sleep(2000);
var logFile = Path.Combine(installDir, "Velopack.log");
var logFile = GetLogFilePath(id);
logger.Info("TEST: update log output - " + Environment.NewLine + File.ReadAllText(logFile));
Assert.Contains("--veloapp-obsolete 1.0.0", File.ReadAllText(argsPath).Trim());
@@ -414,7 +433,7 @@ public class WindowsPackTests
var restartedPath = Path.Combine(installDir, "restarted");
Assert.True(File.Exists(restartedPath));
Assert.Equal("2.0.0,test,args !!", File.ReadAllText(restartedPath).Trim());
Assert.Equal("OnRestarted: 2.0.0,test,args !!", File.ReadAllText(restartedPath).Trim());
var updatePath = Path.Combine(installDir, "Update.exe");
RunNoCoverage(updatePath, ["--silent", "--uninstall"], Environment.CurrentDirectory, logger);
@@ -427,8 +446,8 @@ public class WindowsPackTests
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
using var _2 = TempUtil.GetTempDirectory(out var installDir);
string id = "SquirrelIntegrationTest";
Directory.Delete(GetPackagesPath(id), true);
// pack v1
await PackTestApp(id, "1.0.0", "version 1 test", releaseDir, logger);
@@ -447,7 +466,7 @@ public class WindowsPackTests
var argsPath = Path.Combine(installDir, "args.txt");
Assert.True(File.Exists(argsPath));
var argsContent = File.ReadAllText(argsPath).Trim();
Assert.Equal("--veloapp-install 1.0.0", argsContent);
Assert.Equal("OnAfterInstallFastCallback: --veloapp-install 1.0.0", argsContent);
logger.Info("TEST: v1 installed");
// check app output
@@ -491,7 +510,7 @@ public class WindowsPackTests
logger.Info("TEST: v3 output verified");
// print log output
var logPath = Path.Combine(installDir, "Velopack.log");
var logPath = GetLogFilePath(id);
logger.Info("TEST: log output - " + Environment.NewLine + File.ReadAllText(logPath));
@@ -548,7 +567,7 @@ public class WindowsPackTests
RunNoCoverage(stubExe, [], currentDir, logger, exitCode: 0);
Thread.Sleep(8000); // update.exe will do migration here
string logContents = ReadFileWithRetry(Path.Combine(rootDir, "Velopack.log"), logger);
string logContents = ReadFileWithRetry(GetLogFilePath("LegacyTestApp"), logger);
logger.Info("Velopack.log:" + Environment.NewLine + logContents);
if (origDirName != "current") {
@@ -852,8 +871,7 @@ public class WindowsPackTests
{
string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".ToLower();
return new string(
Enumerable.Repeat(chars, length)
.Select(s => s[_random.Next(s.Length)]).ToArray());
[.. Enumerable.Repeat(chars, length).Select(s => s[_random.Next(s.Length)])]);
}
private string RunNoCoverage(string exe, string[] args, string workingDir, ILogger logger, int? exitCode = 0)