Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Timothy Baldridge 2020-06-05 15:34:23 -06:00
parent a71aaf2a34
commit 58022d648e
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Wabbajack.Server.Test/ModlistUpdater.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Text;
using System.Threading.Tasks;
using Wabbajack.BuildServer;
using Wabbajack.BuildServer.Test;
using Wabbajack.Common;
using Wabbajack.Common.Exceptions;
@ -23,6 +24,8 @@ namespace Wabbajack.Server.Test
[Fact]
public async Task CanIndexAndUpdateFiles()
{
var settings = Fixture.GetService<AppSettings>();
settings.ValidateModUpgrades = false;
var validator = Fixture.GetService<ListValidator>();
var nonNexus = Fixture.GetService<NonNexusDownloadValidator>();
var modLists = await MakeModList("CanIndexAndUpdateFiles.txt");
@ -72,6 +75,9 @@ namespace Wabbajack.Server.Test
[Fact]
public async Task TestEndToEndArchiveUpdating()
{
var settings = Fixture.GetService<AppSettings>();
settings.ValidateModUpgrades = false;
var modLists = await MakeModList("TestEndToEndArchiveUpdating.txt");
Consts.ModlistMetadataURL = modLists.ToString();

1
Wabbajack.Server/AppSettings.cs
View File

@ -35,5 +35,6 @@ namespace Wabbajack.BuildServer
public string SpamWebHook { get; set; } = null;
public string HamWebHook { get; set; } = null;
public bool ValidateModUpgrades { get; set; } = true;
}
}

2
Wabbajack.Server/Controllers/ModUpgrade.cs
View File

@ -35,7 +35,7 @@ namespace Wabbajack.BuildServer.Controllers
return BadRequest("Invalid mod upgrade");
}
if (!await _sql.HashIsInAModlist(request.OldArchive.Hash))
if (_settings.ValidateModUpgrades && !await _sql.HashIsInAModlist(request.OldArchive.Hash))
{
_logger.Log(LogLevel.Information, $"Upgrade requested from {request.OldArchive.Hash} to {request.NewArchive.Hash} rejected as src hash is not in a curated modlist");
return BadRequest("Hash is not in a recent modlist");