Honor cache timeout for discovery.

src/vstest.console/CommandLine/CommandLineOptions.cs

@@ -81,7 +81,7 @@ internal static CommandLineOptions Instance
         private CommandLineOptions()
         {
             this.BatchSize = DefaultBatchSize;
-            this.TestRunStatsEventTimeout = this.DefaultRetrievalTimeout;
+            this.TestStatsEventTimeout = this.DefaultRetrievalTimeout;
             this.FileHelper = new FileHelper();
 #if TODO
             UseVsixExtensions = Utilities.GetAppSettingValue(UseVsixExtensionsKey, false);
@@ -164,9 +164,9 @@ public IEnumerable<string> Sources
         public long BatchSize { get; set; }
 
         /// <summary>
-        /// Specifies the timeout of the runStats event
+        /// Specifies the timeout of the test stats cache timeout event
         /// </summary>
-        public TimeSpan TestRunStatsEventTimeout { get; set; }
+        public TimeSpan TestStatsEventTimeout { get; set; }
 
         /// <summary>
         /// Test case filter value for run with sources.

src/vstest.console/TestPlatformHelpers/TestRequestManager.cs

@@ -127,7 +127,7 @@ public bool DiscoverTests(DiscoveryRequestPayload discoveryPayload, ITestDiscove
             bool success = false;
 
             // create discovery request
-            var criteria = new DiscoveryCriteria(discoveryPayload.Sources, this.commandLineOptions.BatchSize, TimeSpan.MaxValue, discoveryPayload.RunSettings);
+            var criteria = new DiscoveryCriteria(discoveryPayload.Sources, this.commandLineOptions.BatchSize, this.commandLineOptions.TestStatsEventTimeout, discoveryPayload.RunSettings);
             using (IDiscoveryRequest discoveryRequest = this.testPlatform.CreateDiscoveryRequest(criteria))
             {
                 try
@@ -190,7 +190,7 @@ public bool RunTests(TestRunRequestPayload testRunRequestPayload, ITestHostLaunc
                                   this.commandLineOptions.BatchSize,
                                   testRunRequestPayload.KeepAlive,
                                   testRunRequestPayload.RunSettings,
-                                  this.commandLineOptions.TestRunStatsEventTimeout,
+                                  this.commandLineOptions.TestStatsEventTimeout,
                                   testHostLauncher);
                 runCriteria.TestCaseFilter = this.commandLineOptions.TestCaseFilterValue;
             }
@@ -201,7 +201,7 @@ public bool RunTests(TestRunRequestPayload testRunRequestPayload, ITestHostLaunc
                                   this.commandLineOptions.BatchSize,
                                   testRunRequestPayload.KeepAlive,
                                   testRunRequestPayload.RunSettings,
-                                  this.commandLineOptions.TestRunStatsEventTimeout,
+                                  this.commandLineOptions.TestStatsEventTimeout,
                                   testHostLauncher);
             }
 

test/vstest.console.UnitTests/CommandLine/CommandLineOptionsTests.cs

@@ -36,7 +36,7 @@ public void CommandLineOptionsDefaultBatchSizeIsTen()
         public void CommandLineOptionsDefaultTestRunStatsEventTimeoutIsOnePointFiveSec()
         {
             var timeout = new TimeSpan(0, 0, 0, 1, 500);
-            Assert.AreEqual(timeout, CommandLineOptions.Instance.TestRunStatsEventTimeout);
+            Assert.AreEqual(timeout, CommandLineOptions.Instance.TestStatsEventTimeout);
         }
 
         [TestMethod]

test/vstest.console.UnitTests/TestRequestManagerTests.cs

@@ -3,12 +3,19 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests
 {
+    using System;
+    using System.Collections.Generic;
+
+    using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
     using Microsoft.VisualStudio.TestPlatform.CommandLine;
     using Microsoft.VisualStudio.TestPlatform.CommandLine.TestPlatformHelpers;
+    using Microsoft.VisualStudio.TestPlatform.Common.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.Common.Logging;
     using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+
     using Moq;
     using vstest.console.UnitTests.TestDoubles;
 
@@ -24,6 +31,12 @@ public TestRequestManagerTests()
             this.mockLoggerManager = new DummyTestLoggerManager(this.mockLoggerEvents);
         }
 
+        [TestCleanup]
+        public void Cleanup()
+        {
+            CommandLineOptions.Instance.Reset();
+        }
+
         [TestMethod]
         public void TestRequestManagerShouldInitializeConsoleLogger()
         {
@@ -49,5 +62,38 @@ public void TestRequestManagerShouldNotInitializeConsoleLoggerIfDesignModeIsSet(
 
             Assert.IsFalse(mockLoggerEvents.EventsSubscribed());
         }
+
+        [TestMethod]
+        public void DiscoverTestsShouldHonorStatsConfiguration()
+        {
+            // Arrange.
+            long batchSize = 512;
+            var testStatsTimeout = new TimeSpan(0, 0, 0, 59, 0);
+
+            CommandLineOptions.Instance.BatchSize = batchSize;
+            CommandLineOptions.Instance.TestStatsEventTimeout = testStatsTimeout;
+
+            DiscoveryCriteria receivedCriteria = null;
+            var mockTestPlatform = new Mock<ITestPlatform>();
+
+            // Setup.
+            mockTestPlatform.Setup(tp => tp.CreateDiscoveryRequest(It.IsAny<DiscoveryCriteria>()))
+                .Returns(new Mock<IDiscoveryRequest>().Object)
+                .Callback((DiscoveryCriteria criteria) => { receivedCriteria = criteria; });
+
+            var requestManager = new TestRequestManager(CommandLineOptions.Instance,
+                mockTestPlatform.Object,
+                this.mockLoggerManager,
+                TestRunResultAggregator.Instance,
+                new Mock<ITestPlatformEventSource>().Object);
+
+            // Act.
+            requestManager.DiscoverTests(new DiscoveryRequestPayload() { Sources = new List<string> { "C:\\somerandomfile.foo" } }, new Mock<ITestDiscoveryEventsRegistrar>().Object);
+
+            // Assert.
+            Assert.IsNotNull(receivedCriteria);
+            Assert.AreEqual(batchSize, receivedCriteria.FrequencyOfDiscoveredTestsEvent);
+            Assert.AreEqual(testStatsTimeout, receivedCriteria.DiscoveredTestEventTimeout);
+        }
     }
 }