Skip to content

Commit 53f95b3

Browse files
committed
Fix test conflicts
1 parent d41750e commit 53f95b3

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

EddiCore/EDDI.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ public static EDDI Instance
168168
public DataProviderService DataProvider { get; internal set; } = new DataProviderService();
169169
public HotkeyManager HotkeyManager { get; set; } = new HotkeyManager();
170170

171-
172171
// Information obtained from the configuration
173172
[CanBeNull]
174173
public StarSystem HomeStarSystem // May be null when the commander hasn't set a home star system

Tests/CargoMonitorTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void TestCommodityPurchasedEvent ()
144144
Assert.AreEqual( 0, cargo.stolen + cargo.haulage );
145145
}
146146

147-
[ TestMethod ]
147+
[TestMethod, DoNotParallelize]
148148
public void TestCommodityEjectedEvent ()
149149
{
150150
var line = "{ \"timestamp\":\"2018-10-31T03:39:10Z\", \"event\":\"Cargo\", \"Count\":52, \"Inventory\":[ { \"Name\":\"hydrogenfuel\", \"Name_Localised\":\"Hydrogen Fuel\", \"Count\":1, \"Stolen\":0 }, { \"Name\":\"biowaste\", \"MissionID\":426282789, \"Count\":30, \"Stolen\":0 }, { \"Name\":\"animalmeat\", \"Name_Localised\":\"Animal Meat\", \"Count\":1, \"Stolen\":0 }, { \"Name\":\"drones\", \"Name_Localised\":\"Limpet\", \"Count\":20, \"Stolen\":0 } ] }";
@@ -191,7 +191,7 @@ public void TestCommoditySoldEvent ()
191191
Assert.IsNull( cargo );
192192
}
193193

194-
[TestMethod]
194+
[TestMethod, DoNotParallelize]
195195
public void TestCargoMissionScenario()
196196
{
197197
// CargoEvent

Tests/MissionMonitorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public void TestMissionsConfig()
158158
ConfigService.Instance.missionMonitorConfiguration = data;
159159
}
160160

161-
[TestMethod]
161+
[TestMethod, DoNotParallelize]
162162
public void TestMissionEventsScenario()
163163
{
164164
EDDI.Instance.DataProvider = ConfigureTestDataProvider();

0 commit comments

Comments
 (0)