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

More test fixes

Browse Source
This commit is contained in:
Timothy Baldridge 2020-08-12 22:14:35 -06:00
parent 091f342709
commit b181d48722
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Wabbajack.Common/Util/AsyncLock.cs
View File

@ -5,7 +5,6 @@ using System.Reactive.Disposables;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Wabbajack.Common namespace Wabbajack.Common
{ {
public class AsyncLock public class AsyncLock

6
Wabbajack.Lib/Downloaders/HTTPDownloader.cs
View File

@ -98,11 +98,13 @@ namespace Wabbajack.Lib.Downloaders
var bufferSize = 1024 * 32; var bufferSize = 1024 * 32;
Utils.Status($"Starting Download {a.Name ?? Url}", Percent.Zero); Utils.Status($"Starting Download {a.Name ?? Url}", Percent.Zero);
var response = await client.GetAsync(Url); var response = await client.GetAsync(Url, errorsAsExceptions:false, retry:false);
TOP: TOP:
if (!response.IsSuccessStatusCode) if (!response.IsSuccessStatusCode)
{
return false; return false;
}
Stream stream; Stream stream;
try try

3
Wabbajack.Server.Test/ABuildServerSystemTest.cs
View File

@ -170,7 +170,8 @@ namespace Wabbajack.BuildServer.Test
Consts.ModlistSummaryURL = MakeURL("lists/status.json"); Consts.ModlistSummaryURL = MakeURL("lists/status.json");
Consts.ServerWhitelistURL = MakeURL("ServerWhitelist.yaml"); Consts.ServerWhitelistURL = MakeURL("ServerWhitelist.yaml");
Consts.UnlistedModlistMetadataURL = MakeURL("lists/none.json");
} }
public WorkQueue Queue { get; set; } public WorkQueue Queue { get; set; }

5
Wabbajack.Server.Test/ModListValidationTests.cs
View File

@ -4,6 +4,7 @@ using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Dapper;
using Wabbajack.Common; using Wabbajack.Common;
using Wabbajack.Lib; using Wabbajack.Lib;
using Wabbajack.Lib.Downloaders; using Wabbajack.Lib.Downloaders;
@ -54,6 +55,10 @@ namespace Wabbajack.BuildServer.Test
[Fact] [Fact]
public async Task CanValidateModLists() public async Task CanValidateModLists()
{ {
var sql = Fixture.GetService<SqlService>();
await using var conn = await sql.Open();
await conn.ExecuteAsync("DELETE from Patches");
var modlists = await MakeModList("CanValidateModlistsFile.txt"); var modlists = await MakeModList("CanValidateModlistsFile.txt");
Consts.ModlistMetadataURL = modlists.ToString(); Consts.ModlistMetadataURL = modlists.ToString();
Utils.Log("Updating modlists"); Utils.Log("Updating modlists");

4
Wabbajack.Server/Services/PatchBuilder.cs
View File

@ -170,6 +170,10 @@ namespace Wabbajack.Server.Services
var lst = p.Split("_", StringSplitOptions.RemoveEmptyEntries).Select(Hash.FromHex).ToArray(); var lst = p.Split("_", StringSplitOptions.RemoveEmptyEntries).Select(Hash.FromHex).ToArray();
return (lst[0], lst[1]); return (lst[0], lst[1]);
} }
catch (ArgumentException ex)
{
return default;
}
catch (FormatException ex) catch (FormatException ex)
{ {
return default; return default;