Merge pull request #213 from Yubico/tim/revert-initial-three-seconds-delay-changes

Tim/revert initial three seconds delay changes

Author: DennisDyallo

Yubico.YubiKey/src/Yubico/YubiKey/ConnectionFactory.cs

@@ -154,13 +154,12 @@ private void WaitForReclaimTimeout(Transport newTransport)
                 ? TimeSpan.FromMilliseconds(100)
                 : TimeSpan.FromSeconds(3.01);
 
-            // Skip waiting if the transport is already active or was previously None
-            if (_device.LastActiveTransport == newTransport || _device.LastActiveTransport == Transport.None)
+            // We're only affected by the reclaim timeout if we're switching USB transports.
+            if (_device.LastActiveTransport == newTransport)
             {
                 _log.LogDebug(
                     "{Transport} transport is already active. No need to wait for reclaim.",
                     _device.LastActiveTransport);
-                _device.LastActiveTransport = newTransport;
                 return;
             }
 

Yubico.YubiKey/tests/integration/Yubico/YubiKey/ReclaimTimeoutTests.cs

@@ -93,8 +93,7 @@ public void SwitchingBetweenTransports_ForcesThreeSecondWait()
             sw3.Stop();
 
             const long expectedLapse = 3000;
-            const long firstConnectionMaxTime = 100;
-            Assert.True(sw1.ElapsedMilliseconds < firstConnectionMaxTime);
+            Assert.True(sw1.ElapsedMilliseconds > expectedLapse);
             Assert.True(sw2.ElapsedMilliseconds > expectedLapse);
             Assert.True(sw3.ElapsedMilliseconds > expectedLapse);
         }