* Fix tests

Author: lukebakken

projects/Test/Integration/ConnectionRecovery/TestRpcAfterRecovery.cs

@@ -56,7 +56,6 @@ public async Task TestPublishRpcRightAfterReconnect()
             var properties = new BasicProperties();
             properties.ReplyTo = "amq.rabbitmq.reply-to";
 
-            TimeSpan doneSpan = TimeSpan.FromMilliseconds(100);
             var doneTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             Task closeTask = Task.Run(async () =>
             {
@@ -71,8 +70,12 @@ public async Task TestPublishRpcRightAfterReconnect()
                 }
             });
 
-            while (false == doneTcs.Task.IsCompletedSuccessfully())
+            TimeSpan doneSpan = TimeSpan.FromMilliseconds(500);
+            DateTime start = DateTime.Now;
+            do
             {
+                await Task.Delay(doneSpan);
+
                 try
                 {
                     await _channel.BasicPublishAsync(string.Empty, testQueueName, properties, _messageBody);
@@ -86,14 +89,14 @@ public async Task TestPublishRpcRightAfterReconnect()
                     }
                 }
 
-                try
-                {
-                    await doneTcs.Task.WaitAsync(doneSpan);
-                }
-                catch (TimeoutException)
+                DateTime now = DateTime.Now;
+
+                if (now - start > WaitSpan)
                 {
+                    Assert.Fail($"test exceeded wait time of {WaitSpan}");
                 }
-            }
+
+            } while (false == doneTcs.Task.IsCompletedSuccessfully());
 
             await closeTask;
         }

projects/Test/SequentialIntegration/TestActivitySource.cs

@@ -207,12 +207,16 @@ private void AssertActivityData(bool useRoutingKeyAsOperationName, string queueN
             string childName = isDeliver ? "deliver" : "receive";
             Activity[] activities = activityList.ToArray();
             Assert.NotEmpty(activities);
-            foreach (var item in activities)
+
+            if (IsVerbose)
             {
-                _output.WriteLine(
-                    $"{item.Context.TraceId}: {item.OperationName}");
-                _output.WriteLine($"  Tags: {string.Join(", ", item.Tags.Select(x => $"{x.Key}: {x.Value}"))}");
-                _output.WriteLine($"  Links: {string.Join(", ", item.Links.Select(x => $"{x.Context.TraceId}"))}");
+                foreach (Activity item in activities)
+                {
+                    _output.WriteLine(
+                        $"{item.Context.TraceId}: {item.OperationName}");
+                    _output.WriteLine($"  Tags: {string.Join(", ", item.Tags.Select(x => $"{x.Key}: {x.Value}"))}");
+                    _output.WriteLine($"  Links: {string.Join(", ", item.Links.Select(x => $"{x.Context.TraceId}"))}");
+                }
             }
 
             Activity sendActivity = activities.First(x =>

projects/Test/SequentialIntegration/TestConnectionRecovery.cs

@@ -82,7 +82,7 @@ public async Task TestChannelAfterDispose_GH1086()
 
             void _channel_ChannelShutdown(object sender, ShutdownEventArgs e)
             {
-                sawChannelShutdownTcs.SetResult(true);
+                sawChannelShutdownTcs.TrySetResult(true);
             }
 
             _channel.ChannelShutdown += _channel_ChannelShutdown;