Skip to content

Commit 397526f

Browse files
lukebakkenlukebakken
committed
* Now that Dispose does not use .GetAwaiter().GetResult(), these tests can test dedicated _and_ shared IChannel instances.
1 parent af74676 commit 397526f

File tree

2 files changed

+192
-127
lines changed

2 files changed

+192
-127
lines changed

‎projects/Test/Integration/TestExchangeDeclare.cs

Lines changed: 93 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ public TestExchangeDeclare(ITestOutputHelper output) : base(output)
4747
{
4848
}
4949

50-
[Fact]
51-
public async Task TestConcurrentExchangeDeclareAndBind()
50+
[Theory]
51+
[InlineData(true)]
52+
[InlineData(false)]
53+
public async Task TestConcurrentExchangeDeclareAndBind(bool useDedicatedChannelPerTask)
5254
{
5355
var exchangeNames = new ConcurrentBag<ExchangeName>();
5456
var tasks = new List<Task>();
@@ -61,27 +63,35 @@ public async Task TestConcurrentExchangeDeclareAndBind()
6163
{
6264
async Task f()
6365
{
64-
using (IChannel ch = await _conn.CreateChannelAsync())
66+
IChannel ch = _channel;
67+
if (useDedicatedChannelPerTask)
6568
{
66-
try
67-
{
68-
await Task.Delay(S_Random.Next(5, 50));
69-
ExchangeName exchangeName = GenerateExchangeName();
70-
await ch.ExchangeDeclareAsync(exchange: exchangeName, type: ExchangeType.Fanout, false, false);
71-
await ch.ExchangeBindAsync(destination: ex_destination, source: exchangeName,
72-
routingKey: new RoutingKey("unused"));
73-
exchangeNames.Add(exchangeName);
74-
}
75-
catch (NotSupportedException e)
76-
{
77-
nse = e;
78-
}
79-
finally
69+
ch = await _conn.CreateChannelAsync();
70+
}
71+
72+
try
73+
{
74+
await Task.Delay(S_Random.Next(5, 50));
75+
ExchangeName exchangeName = GenerateExchangeName();
76+
await ch.ExchangeDeclareAsync(exchange: exchangeName, type: ExchangeType.Fanout, false, false);
77+
await ch.ExchangeBindAsync(destination: ex_destination, source: exchangeName,
78+
routingKey: new RoutingKey("unused"));
79+
exchangeNames.Add(exchangeName);
80+
}
81+
catch (NotSupportedException e)
82+
{
83+
nse = e;
84+
}
85+
finally
86+
{
87+
if (useDedicatedChannelPerTask)
8088
{
8189
await ch.CloseAsync();
90+
ch.Dispose();
8291
}
8392
}
8493
}
94+
8595
var t = Task.Run(f);
8696
tasks.Add(t);
8797
}
@@ -94,22 +104,29 @@ await ch.ExchangeBindAsync(destination: ex_destination, source: exchangeName,
94104
{
95105
async Task f()
96106
{
97-
using (IChannel ch = await _conn.CreateChannelAsync())
107+
IChannel ch = _channel;
108+
if (useDedicatedChannelPerTask)
98109
{
99-
try
100-
{
101-
await Task.Delay(S_Random.Next(5, 50));
102-
await _channel.ExchangeUnbindAsync(destination: ex_destination, source: exchangeName, routingKey: (RoutingKey)"unused",
103-
noWait: false, arguments: null);
104-
await _channel.ExchangeDeleteAsync(exchange: exchangeName, ifUnused: false);
105-
}
106-
catch (NotSupportedException e)
107-
{
108-
nse = e;
109-
}
110-
finally
110+
ch = await _conn.CreateChannelAsync();
111+
}
112+
113+
try
114+
{
115+
await Task.Delay(S_Random.Next(5, 50));
116+
await _channel.ExchangeUnbindAsync(destination: ex_destination, source: exchangeName, routingKey: (RoutingKey)"unused",
117+
noWait: false, arguments: null);
118+
await _channel.ExchangeDeleteAsync(exchange: exchangeName, ifUnused: false);
119+
}
120+
catch (NotSupportedException e)
121+
{
122+
nse = e;
123+
}
124+
finally
125+
{
126+
if (useDedicatedChannelPerTask)
111127
{
112128
await ch.CloseAsync();
129+
ch.Dispose();
113130
}
114131
}
115132
}
@@ -122,8 +139,10 @@ await _channel.ExchangeUnbindAsync(destination: ex_destination, source: exchange
122139
await _channel.ExchangeDeleteAsync(exchange: ex_destination);
123140
}
124141

125-
[Fact]
126-
public async Task TestConcurrentExchangeDeclareAndDelete()
142+
[Theory]
143+
[InlineData(true)]
144+
[InlineData(false)]
145+
public async Task TestConcurrentExchangeDeclareAndDelete(bool useDedicatedChannelPerTask)
127146
{
128147
var exchangeNames = new ConcurrentBag<ExchangeName>();
129148
var tasks = new List<Task>();
@@ -132,24 +151,31 @@ public async Task TestConcurrentExchangeDeclareAndDelete()
132151
{
133152
var t = Task.Run(async () =>
134153
{
135-
using (IChannel ch = await _conn.CreateChannelAsync())
154+
IChannel ch = _channel;
155+
if (useDedicatedChannelPerTask)
136156
{
137-
try
138-
{
139-
// sleep for a random amount of time to increase the chances
140-
// of thread interleaving. MK.
141-
await Task.Delay(_rnd.Next(5, 500));
142-
ExchangeName exchangeName = GenerateExchangeName();
143-
await ch.ExchangeDeclareAsync(exchange: exchangeName, ExchangeType.Fanout, false, false);
144-
exchangeNames.Add(exchangeName);
145-
}
146-
catch (NotSupportedException e)
147-
{
148-
nse = e;
149-
}
150-
finally
157+
ch = await _conn.CreateChannelAsync();
158+
}
159+
160+
try
161+
{
162+
// sleep for a random amount of time to increase the chances
163+
// of thread interleaving. MK.
164+
await Task.Delay(_rnd.Next(5, 500));
165+
ExchangeName exchangeName = GenerateExchangeName();
166+
await ch.ExchangeDeclareAsync(exchange: exchangeName, ExchangeType.Fanout, false, false);
167+
exchangeNames.Add(exchangeName);
168+
}
169+
catch (NotSupportedException e)
170+
{
171+
nse = e;
172+
}
173+
finally
174+
{
175+
if (useDedicatedChannelPerTask)
151176
{
152177
await ch.CloseAsync();
178+
ch.Dispose();
153179
}
154180
}
155181
});
@@ -166,22 +192,29 @@ public async Task TestConcurrentExchangeDeclareAndDelete()
166192
ExchangeName ex = exchangeName;
167193
var t = Task.Run(async () =>
168194
{
169-
using (IChannel ch = await _conn.CreateChannelAsync())
195+
IChannel ch = _channel;
196+
if (useDedicatedChannelPerTask)
170197
{
171-
try
172-
{
173-
// sleep for a random amount of time to increase the chances
174-
// of thread interleaving. MK.
175-
await Task.Delay(_rnd.Next(5, 500));
176-
await ch.ExchangeDeleteAsync(ex);
177-
}
178-
catch (NotSupportedException e)
179-
{
180-
nse = e;
181-
}
182-
finally
198+
ch = await _conn.CreateChannelAsync();
199+
}
200+
201+
try
202+
{
203+
// sleep for a random amount of time to increase the chances
204+
// of thread interleaving. MK.
205+
await Task.Delay(_rnd.Next(5, 500));
206+
await ch.ExchangeDeleteAsync(ex);
207+
}
208+
catch (NotSupportedException e)
209+
{
210+
nse = e;
211+
}
212+
finally
213+
{
214+
if (useDedicatedChannelPerTask)
183215
{
184216
await ch.CloseAsync();
217+
ch.Dispose();
185218
}
186219
}
187220
});

0 commit comments

Comments
 (0)