Addressing PR comments.

dotnet · Apr 21, 2016 · 7fe8ab5 · 7fe8ab5
1 parent 681a227
commit 7fe8ab5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/src/Common/tests/System/Net/VirtualNetwork/VirtualNetwork.cs b/src/Common/tests/System/Net/VirtualNetwork/VirtualNetwork.cs
@@ -10,7 +10,7 @@ namespace System.Net.Test.Common
 {
     public class VirtualNetwork
     {
-        private readonly int WaitForReadDataTimeoutMilliseconds = 10 * 1000;
+        private readonly int WaitForReadDataTimeoutMilliseconds = 30 * 1000;
 
         private readonly ConcurrentQueue<byte[]> _clientWriteQueue = new ConcurrentQueue<byte[]>();
         private readonly ConcurrentQueue<byte[]> _serverWriteQueue = new ConcurrentQueue<byte[]>();
@@ -34,11 +34,14 @@ public void ReadFrame(bool server, out byte[] buffer)
                 packetQueue = _serverWriteQueue;
             }
 
-            semaphore.Wait(WaitForReadDataTimeoutMilliseconds);
+            if (!semaphore.Wait(WaitForReadDataTimeoutMilliseconds))
+            {
+                throw new TimeoutException("VirtualNetwork: Timeout reading the next frame.");
+            }
 
             bool dequeueSucceeded = false;
-            int remainingRetries = 3;
-            int backOffDelayMilliseconds = 10;
+            int remainingTries = 3;
+            int backOffDelayMilliseconds = 2;
 
             do
             {
@@ -48,11 +51,11 @@ public void ReadFrame(bool server, out byte[] buffer)
                     break;
                 }
 
-                remainingRetries--;
+                remainingTries--;
                 backOffDelayMilliseconds *= backOffDelayMilliseconds;
                 Thread.Sleep(backOffDelayMilliseconds);
             }
-            while (!dequeueSucceeded && (remainingRetries > 0));
+            while (!dequeueSucceeded && (remainingTries > 0));
 
             Debug.Assert(dequeueSucceeded, "Packet queue: TryDequeue failed.");
         }

diff --git a/src/Common/tests/Tests/System/Net/VirtualNetworkStreamTest.cs b/src/Common/tests/Tests/System/Net/VirtualNetworkStreamTest.cs
@@ -17,8 +17,6 @@ public class VirtualNetworkStreamTest
         public void VirtualNetworkStream_SingleThreadIntegrityTest_Ok()
         {
             var rnd = new Random();
-            var rndLock = new object();
-
             var network = new VirtualNetwork();
 
             using (var client = new VirtualNetworkStream(network, isServer: false))
@@ -29,12 +27,9 @@ public void VirtualNetworkStream_SingleThreadIntegrityTest_Ok()
                     int bufferSize;
                     byte[] writeFrame;
 
-                    lock (rndLock)
-                    {
-                        bufferSize = rnd.Next(1, 2048);
-                        writeFrame = new byte[bufferSize];
-                        rnd.NextBytes(writeFrame);
-                    }
+                    bufferSize = rnd.Next(1, 2048);
+                    writeFrame = new byte[bufferSize];
+                    rnd.NextBytes(writeFrame);
 
                     uint writeChecksum = Fletcher32.Checksum(writeFrame, 0, writeFrame.Length);
                     client.Write(writeFrame, 0, writeFrame.Length);
@@ -117,7 +112,7 @@ public void VirtualNetworkStream_MultiThreadIntegrityTest_Ok()
             using (var client = new VirtualNetworkStream(network, isServer: false))
             using (var server = new VirtualNetworkStream(network, isServer: true))
             {
-                Parallel.For(0, 100000, async (int i) =>
+                Parallel.For(0, 100, (int i) =>
                 {
                     int bufferSize;
                     int delayMilliseconds;
@@ -142,13 +137,12 @@ public void VirtualNetworkStream_MultiThreadIntegrityTest_Ok()
 
                     checksumAndLengths.AddOrUpdate(i, writeFrameInfo, (seq, checkSum) => { Debug.Fail("Attempt to update checksum."); return new Tuple<uint, int>(0, 0); });
 
-                    await client.WriteAsync(writeFrame, 0, writeFrame.Length);
-
-                    await Task.Delay(delayMilliseconds);
+                    client.WriteAsync(writeFrame, 0, writeFrame.Length).GetAwaiter().GetResult();
+                    Task.Delay(delayMilliseconds).GetAwaiter().GetResult();
 
                     // First read the index to know how much data to read from this frame.
                     var readFrame = new byte[maxFrameSize];
-                    int readLen = await server.ReadAsync(readFrame, 0, maxFrameSize);
+                    int readLen = server.ReadAsync(readFrame, 0, maxFrameSize).GetAwaiter().GetResult();
 
                     int idx = BitConverter.ToInt32(readFrame, 0);
                     Tuple<uint, int> expectedFrameInfo = checksumAndLengths[idx];