Fix sending tests

dotpcap · Mar 14, 2020 · e416a44 · e416a44
1 parent d5290c1
commit e416a44
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 30 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
           command: sudo bash .circleci/install.sh
       - run:
           name: Test
-          command: sudo dotnet test --test-adapter-path:. --logger:junit -f netcoreapp2.1
+          command: sudo dotnet test --test-adapter-path:. --logger:junit -f netcoreapp2.1 --filter TestCategory!=SendPacket
       - store_test_results:
           path: Test/TestResults
 

diff --git a/.config/travis/test.sh b/.config/travis/test.sh
@@ -10,5 +10,5 @@ fi
 # Test on linux
 if [ "$TRAVIS_OS_NAME" = "linux" ]
 then
-    sudo dotnet test -f netcoreapp2.1
+    sudo dotnet test -f netcoreapp2.1 --filter TestCategory!=SendPacket
 fi
diff --git a/Test/PcapDeviceTest.cs b/Test/PcapDeviceTest.cs
@@ -42,6 +42,7 @@ public class PcapDeviceTest
         /// Test that the proper exception is thrown if a user tries to
         /// call GetNextPacket() while a capture loop is running.
         /// </summary>
+        [NonParallelizable]
         [Test]
         public void GetNextPacketExceptionIfCaptureLoopRunning()
         {

diff --git a/Test/SendPacketTest.cs b/Test/SendPacketTest.cs
@@ -12,22 +12,19 @@ namespace Test
 {
     [TestFixture]
     [NonParallelizable]
+    [Category("SendPacket")]
     public class SendPacketTest
     {
         private const string Filter = "ether proto 0x1234";
 
         [Test]
-        [Ignore("Not sure why test fails")]
         public void TestSendPacketTest()
         {
             var packet = EthernetPacket.RandomPacket();
             packet.Type = (EthernetType)0x1234;
             var received = RunCapture(Filter, (device) =>
             {
                 device.SendPacket(packet);
-                // Test hack: MacOS 10.15, delay of 1000ms causes this test to pass on cmorgan's 2019 macbook pro,
-                // 500ms does not
-                System.Threading.Thread.Sleep(1000);
             });
             Assert.That(received, Has.Count.EqualTo(1));
             CollectionAssert.AreEquivalent(packet.Bytes, received[0].Data);

diff --git a/Test/SendQueueTest.cs b/Test/SendQueueTest.cs
@@ -20,7 +20,6 @@ public class SendQueueTest
         private static readonly int DeltaMs = 10;
 
         [Test]
-        [Ignore("Not sure why test fails")]
         public void TestNativeTransmitNormal()
         {
             if (SendQueue.IsHardwareAccelerated)
@@ -37,7 +36,6 @@ public void TestNativeTransmitNormal()
         }
 
         [Test]
-        [Ignore("Not sure why test fails")]
         public void TestNativeTransmitSync()
         {
             if (SendQueue.IsHardwareAccelerated)
@@ -54,31 +52,21 @@ public void TestNativeTransmitSync()
         }
 
         [Test]
-        [Ignore("Not sure why test fails")]
         public void TestManagedTransmitNormal()
         {
             var received = RunCapture(Filter, (device) =>
             {
                 GetSendQueue().ManagedTransmit(device, false);
-
-                // Test hack: MacOS 10.15, delay of 1000ms causes this test to pass on cmorgan's 2019 macbook pro,
-                // delay of 500ms does not
-                System.Threading.Thread.Sleep(1000);
             });
             AssertGoodTransmitNormal(received);
         }
 
         [Test]
-        [Ignore("Not sure why test fails")]
         public void TestManagedTransmitSync()
         {
             var received = RunCapture(Filter, (device) =>
             {
                 GetSendQueue().ManagedTransmit(device, true);
-
-                // Test hack: MacOS 10.15, delay of 2000ms causes this test to pass on cmorgan's 2019 macbook pro,
-                // delay of 1500ms does not
-                System.Threading.Thread.Sleep(2000);
             });
             AssertGoodTransmitSync(received);
         }
@@ -96,7 +84,6 @@ private static void AssertGoodTransmitSync(List<RawCapture> received)
         }
 
         [Test]
-        [Ignore("Not sure why test fails")]
         public void TestReturnValue()
         {
             if (SendQueue.IsHardwareAccelerated)

diff --git a/Test/TestHelper.cs b/Test/TestHelper.cs
@@ -50,7 +50,8 @@ internal static PcapDevice GetPcapDevice()
                 {
                     Console.WriteLine(ex);
                     continue;
-                } finally
+                }
+                finally
                 {
                     if (device.Opened) device.Close();
                 }
@@ -79,22 +80,25 @@ internal static List<RawCapture> RunCapture(string filter, Action<PcapDevice> ro
             }
             Console.WriteLine($"Using device {device}");
             var received = new List<RawCapture>();
-            device.Open();
+            device.Open(DeviceMode.Normal, 1);
             device.Filter = filter;
-            void OnPacketArrival(object sender, CaptureEventArgs e)
-            {
-                received.Add(e.Packet);
-            }
-            device.OnPacketArrival += OnPacketArrival;
-            device.StartCapture();
             try
             {
                 routine(device);
+                // waiting for any queued packets to be sent
+                Thread.Sleep(10);
+                while (true)
+                {
+                    var packet = device.GetNextPacket();
+                    if (packet == null)
+                    {
+                        break;
+                    }
+                    received.Add(packet);
+                }
             }
             finally
             {
-                device.StopCapture();
-                device.OnPacketArrival -= OnPacketArrival;
                 device.Close();
             }
             return received;

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -29,7 +29,7 @@ jobs:
       sudo apt-get install -y libpcap-dev
   - script: |
       set -e
-      sudo dotnet test -f netcoreapp2.1 Test/Test.csproj --configuration $(buildConfiguration) --logger trx --filter TestCategory!=Performance
+      sudo dotnet test -f netcoreapp2.1 Test/Test.csproj --configuration $(buildConfiguration) --logger trx --filter "TestCategory!=Performance&TestCategory!=SendPacket"
   - task: PublishTestResults@2
     condition: succeededOrFailed()
     inputs: