tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try fix test failures (#18620)

Browse Source
This commit is contained in:
Leon Friedrich
2023-08-04 06:34:51 +12:00
committed by GitHub
parent c1d677ea9f
commit f74c5861f4
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
View File

@@ -233,9 +233,14 @@ public abstract partial class InteractionTest
} }
[TearDown] [TearDown]
public virtual async Task Cleanup() public async Task TearDownInternal()
{ {
await Server.WaitPost(() => MapMan.DeleteMap(MapId)); await Server.WaitPost(() => MapMan.DeleteMap(MapId));
await PairTracker.CleanReturnAsync(); await PairTracker.CleanReturnAsync();
await TearDown();
}
protected virtual async Task TearDown()
{
} }
} }

12
Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs
View File

@@ -11,7 +11,7 @@ using Robust.UnitTesting;
namespace Content.IntegrationTests.Tests.Toolshed; namespace Content.IntegrationTests.Tests.Toolshed;
[TestFixture] [TestFixture]
[FixtureLifeCycle(LifeCycle.SingleInstance)] [FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
public abstract class ToolshedTest : IInvocationContext public abstract class ToolshedTest : IInvocationContext
{ {
protected PairTracker PairTracker = default!; protected PairTracker PairTracker = default!;
@@ -27,13 +27,19 @@ public abstract class ToolshedTest : IInvocationContext
protected IInvocationContext? Context = null; protected IInvocationContext? Context = null;
[TearDown] [TearDown]
public virtual async Task TearDown() public async Task TearDownInternal()
{
await PairTracker.CleanReturnAsync();
await TearDown();
}
protected virtual async Task TearDown()
{ {
Assert.IsEmpty(_expectedErrors); Assert.IsEmpty(_expectedErrors);
ClearErrors(); ClearErrors();
} }
[OneTimeSetUp] [SetUp]
public virtual async Task Setup() public virtual async Task Setup()
{ {
PairTracker = await PoolManager.GetServerClient(new PoolSettings {NoClient = NoClient}); PairTracker = await PoolManager.GetServerClient(new PoolSettings {NoClient = NoClient});