Skip to content

Commit 17db4d9

Browse files
david-driscolldavid-driscoll
committed
auto-retry on a few more integration tests
1 parent 3ed4d48 commit 17db4d9

File tree

4 files changed

+27
-25
lines changed

4 files changed

+27
-25
lines changed

‎test/Lsp.Tests/Integration/InitializationTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using OmniSharp.Extensions.LanguageServer.Protocol.Window;
2222
using OmniSharp.Extensions.LanguageServer.Server;
2323
using Serilog.Events;
24+
using TestingUtils;
2425
using Xunit;
2526
using Xunit.Abstractions;
2627

@@ -32,7 +33,7 @@ public InitializationTests(ITestOutputHelper outputHelper) : base(new JsonRpcTes
3233
{
3334
}
3435

35-
[Fact]
36+
[RetryFact]
3637
public async Task Logs_should_be_allowed_during_startup()
3738
{
3839
await Initialize(ConfigureClient, ConfigureServer);
@@ -41,7 +42,7 @@ public async Task Logs_should_be_allowed_during_startup()
4142
_logs.Should().ContainInOrder("OnInitialize", "OnInitialized");
4243
}
4344

44-
[Fact]
45+
[RetryFact]
4546
public async Task Facades_should_be_resolvable()
4647
{
4748
var (client, server) = await Initialize(ConfigureClient, ConfigureServer);
@@ -53,7 +54,7 @@ public async Task Facades_should_be_resolvable()
5354
response.Should().NotBeNull();
5455
}
5556

56-
[Fact]
57+
[RetryFact]
5758
public async Task Should_Not_Be_Able_To_Send_Messages_Unit_Initialization()
5859
{
5960
if (!(TestOptions.ClientLoggerFactory is TestLoggerFactory loggerFactory)) throw new Exception("wtf");
@@ -95,7 +96,7 @@ public async Task Should_Not_Be_Able_To_Send_Messages_Unit_Initialization()
9596
onInitializedNotify.Received(1).Invoke();
9697
}
9798

98-
[Fact]
99+
[RetryFact]
99100
public async Task Should_Be_Able_To_Register_Before_Initialize()
100101
{
101102
var (client, server) = Create(options => options.EnableDynamicRegistration().EnableAllCapabilities(), options => { });

‎test/Lsp.Tests/Integration/LanguageServerConfigurationTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public LanguageServerConfigurationTests(ITestOutputHelper outputHelper) : base(n
3131
{
3232
}
3333

34-
[Fact]
34+
[RetryFact]
3535
public async Task Should_Not_Support_Configuration_It_Not_Configured()
3636
{
3737
var (_, server, configuration) = await InitializeWithConfiguration(ConfigureClient, o => { });
@@ -45,7 +45,7 @@ public async Task Should_Not_Support_Configuration_It_Not_Configured()
4545
server.Configuration.AsEnumerable().Should().BeEmpty();
4646
}
4747

48-
[Fact]
48+
[RetryFact]
4949
public async Task Should_Allow_Null_Response()
5050
{
5151
var (client, server) = await Initialize(
@@ -59,7 +59,7 @@ public async Task Should_Allow_Null_Response()
5959
a.Should().NotThrow();
6060
}
6161

62-
[Fact]
62+
[RetryFact]
6363
public async Task Should_Update_Configuration_On_Server()
6464
{
6565
var (_, server, configuration) = await InitializeWithConfiguration(ConfigureClient, ConfigureServer);
@@ -74,7 +74,7 @@ public async Task Should_Update_Configuration_On_Server()
7474
server.Configuration["othersection:value"].Should().Be("key");
7575
}
7676

77-
[Fact]
77+
[RetryFact]
7878
public async Task Should_Update_Configuration_On_Server_After_Starting()
7979
{
8080
var (_, server, configuration) = await InitializeWithConfiguration(ConfigureClient, options => {});
@@ -90,7 +90,7 @@ public async Task Should_Update_Configuration_On_Server_After_Starting()
9090
server.Configuration["othersection:value"].Should().Be("key");
9191
}
9292

93-
[Fact]
93+
[RetryFact]
9494
public async Task Should_Update_Configuration_Should_Stop_Watching_Sections()
9595
{
9696
var (_, server, configuration) = await InitializeWithConfiguration(ConfigureClient, ConfigureServer);
@@ -112,7 +112,7 @@ public async Task Should_Update_Configuration_Should_Stop_Watching_Sections()
112112
server.Configuration["othersection:value"].Should().BeNull();
113113
}
114114

115-
[Fact]
115+
[RetryFact]
116116
public async Task Should_Update_Scoped_Configuration()
117117
{
118118
var (_, server, configuration) = await InitializeWithConfiguration(ConfigureClient, ConfigureServer);
@@ -134,7 +134,7 @@ public async Task Should_Update_Scoped_Configuration()
134134
scopedConfiguration["othersection:value"].Should().Be("scopedkey");
135135
}
136136

137-
[Fact]
137+
[RetryFact]
138138
public async Task Should_Fallback_To_Original_Configuration()
139139
{
140140
var (_, server, configuration) = await InitializeWithConfiguration(ConfigureClient, ConfigureServer);
@@ -166,7 +166,7 @@ public async Task Should_Fallback_To_Original_Configuration()
166166
scopedConfiguration["othersection:value"].Should().Be("key");
167167
}
168168

169-
[Fact]
169+
[RetryFact]
170170
public async Task Should_Only_Update_Configuration_Items_That_Are_Defined()
171171
{
172172
var (_, server, configuration) = await InitializeWithConfiguration(ConfigureClient, ConfigureServer);
@@ -208,7 +208,7 @@ public async Task Should_Support_Configuration_Binding()
208208
data.Port.Should().Be(80);
209209
}
210210

211-
[Fact]
211+
[RetryFact]
212212
public async Task Should_Support_Options()
213213
{
214214
var (_, server, configuration) = await InitializeWithConfiguration(ConfigureClient, options => {

‎test/Lsp.Tests/Integration/ProgressTests.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Microsoft.Extensions.DependencyInjection;
1010
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
1111
using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
12+
using TestingUtils;
1213
using Xunit;
1314
using Xunit.Abstractions;
1415

@@ -25,7 +26,7 @@ private class Data
2526
public string Value { get; set; } = "Value";
2627
}
2728

28-
[Fact]
29+
[RetryFact]
2930
public async Task Should_Send_Progress_From_Server_To_Client()
3031
{
3132
var token = new ProgressToken(Guid.NewGuid().ToString());
@@ -73,7 +74,7 @@ await Observable.Create<Unit>(
7374
data.Should().ContainInOrder(new[] { "1", "3", "2", "4", "5" });
7475
}
7576

76-
[Fact]
77+
[RetryFact]
7778
public async Task Should_Send_Progress_From_Client_To_Server()
7879
{
7980
var token = new ProgressToken(Guid.NewGuid().ToString());
@@ -121,14 +122,14 @@ await Observable.Create<Unit>(
121122
data.Should().ContainInOrder(new[] { "1", "3", "2", "4", "5" });
122123
}
123124

124-
[Fact]
125+
[RetryFact]
125126
public void WorkDone_Should_Be_Supported()
126127
{
127128
Server.WorkDoneManager.IsSupported.Should().BeTrue();
128129
Client.WorkDoneManager.IsSupported.Should().BeTrue();
129130
}
130131

131-
[Fact]
132+
[RetryFact]
132133
public async Task Should_Support_Creating_Work_Done_From_Sever_To_Client()
133134
{
134135
var token = new ProgressToken(Guid.NewGuid().ToString());
@@ -190,7 +191,7 @@ public async Task Should_Support_Creating_Work_Done_From_Sever_To_Client()
190191
results.Should().ContainInOrder("Begin", "Report 1", "Report 2", "Report 3", "Report 4", "End");
191192
}
192193

193-
[Fact]
194+
[RetryFact]
194195
public async Task Should_Support_Observing_Work_Done_From_Client_To_Server_Request()
195196
{
196197
var token = new ProgressToken(Guid.NewGuid().ToString());
@@ -252,7 +253,7 @@ public async Task Should_Support_Observing_Work_Done_From_Client_To_Server_Reque
252253
results.Should().ContainInOrder("Begin", "Report 1", "Report 2", "Report 3", "Report 4", "End");
253254
}
254255

255-
[Fact]
256+
[RetryFact]
256257
public async Task Should_Support_Cancelling_Work_Done_From_Client_To_Server_Request()
257258
{
258259
var token = new ProgressToken(Guid.NewGuid().ToString());

‎test/Lsp.Tests/Integration/RenameTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public RenameTests(ITestOutputHelper outputHelper) : base(new JsonRpcTestOptions
3232
_rename = Substitute.For<Func<RenameParams, RenameCapability, CancellationToken, Task<WorkspaceEdit?>>>();
3333
}
3434

35-
[Fact]
35+
[RetryFact]
3636
public async Task Should_Handle_Rename_With_No_Value()
3737
{
3838
_prepareRename.Invoke(Arg.Any<PrepareRenameParams>(), Arg.Any<RenameCapability>(), Arg.Any<CancellationToken>())
@@ -88,7 +88,7 @@ public async Task Should_Handle_Rename_With_No_Value()
8888
capability1.Should().BeSameAs(capability2);
8989
}
9090

91-
[Fact]
91+
[RetryFact]
9292
public async Task Should_Handle_Prepare_Rename_With_No_Value()
9393
{
9494
_prepareRename.Invoke(Arg.Any<PrepareRenameParams>(), Arg.Any<RenameCapability>(), Arg.Any<CancellationToken>())
@@ -106,7 +106,7 @@ public async Task Should_Handle_Prepare_Rename_With_No_Value()
106106
result.Should().BeNull();
107107
}
108108

109-
[Fact]
109+
[RetryFact]
110110
public async Task Should_Handle_Prepare_Rename_With_Range()
111111
{
112112
_prepareRename.Invoke(Arg.Any<PrepareRenameParams>(), Arg.Any<RenameCapability>(), Arg.Any<CancellationToken>())
@@ -135,7 +135,7 @@ public async Task Should_Handle_Prepare_Rename_With_Range()
135135
result!.IsRange.Should().BeTrue();
136136
}
137137

138-
[Fact]
138+
[RetryFact]
139139
public async Task Should_Handle_Prepare_Rename_With_PlaceholderRange()
140140
{
141141
_prepareRename.Invoke(Arg.Any<PrepareRenameParams>(), Arg.Any<RenameCapability>(), Arg.Any<CancellationToken>())
@@ -168,7 +168,7 @@ public async Task Should_Handle_Prepare_Rename_With_PlaceholderRange()
168168
result!.IsPlaceholderRange.Should().BeTrue();
169169
}
170170

171-
[Fact]
171+
[RetryFact]
172172
public async Task Should_Handle_Prepare_Rename_With_DefaultBehavior()
173173
{
174174
_prepareRename.Invoke(Arg.Any<PrepareRenameParams>(), Arg.Any<RenameCapability>(), Arg.Any<CancellationToken>())
@@ -193,7 +193,7 @@ public async Task Should_Handle_Prepare_Rename_With_DefaultBehavior()
193193
result!.IsDefaultBehavior.Should().BeTrue();
194194
}
195195

196-
[Fact]
196+
[RetryFact]
197197
public async Task Should_Not_Register_Prepare_Rename()
198198
{
199199
var (client, _) = await Initialize(ClientOptionsAction, ServerOptionsAction);

0 commit comments

Comments
 (0)