Merge pull request #411 from NuGet/loshar-fi

[ReleasePrep][2018.04.25]FI of master into dev

Author: loic-sharma

src/NuGet.Services.Validation.Orchestrator/ValidationSetProcessor.cs

@@ -92,7 +92,7 @@ private async Task<bool> ProcessIncompleteValidations(PackageValidationSet valid
                     }
 
                     var validator = _validatorProvider.GetValidator(packageValidation.Type);
-                    var validationRequest = await CreateValidationRequest(packageValidation.PackageValidationSet, packageValidation, package, validationConfiguration);
+                    var validationRequest = await CreateValidationRequest(packageValidation.PackageValidationSet, packageValidation, package);
                     var validationResult = await validator.GetResultAsync(validationRequest);
 
                     if (validationResult.Status != ValidationStatus.Incomplete)
@@ -186,7 +186,7 @@ private async Task<bool> ProcessNotStartedValidations(PackageValidationSet valid
                     }
 
                     var validator = _validatorProvider.GetValidator(packageValidation.Type);
-                    var validationRequest = await CreateValidationRequest(packageValidation.PackageValidationSet, packageValidation, package, validationConfiguration);
+                    var validationRequest = await CreateValidationRequest(packageValidation.PackageValidationSet, packageValidation, package);
                     var validationResult = await validator.GetResultAsync(validationRequest);
 
                     if (validationResult.Status == ValidationStatus.NotStarted)
@@ -254,12 +254,11 @@ private async Task OnUnknownValidation(PackageValidation packageValidation)
         private async Task<IValidationRequest> CreateValidationRequest(
             PackageValidationSet packageValidationSet,
             PackageValidation packageValidation,
-            Package package,
-            ValidationConfigurationItem validationConfiguration)
+            Package package)
         {
             var nupkgUrl = await _packageFileService.GetPackageForValidationSetReadUriAsync(
                 packageValidationSet,
-                DateTimeOffset.UtcNow.Add(validationConfiguration.TrackAfter));
+                DateTimeOffset.UtcNow.Add(_validationConfiguration.TimeoutValidationSetAfter));
 
             var validationRequest = new ValidationRequest(
                 validationId: packageValidation.Key,

tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationSetProcessorFacts.cs

@@ -297,7 +297,8 @@ public async Task UsesProperNupkgUrl()
         {
             UseDefaultValidatorProvider();
             var validator = AddValidation("validation1", TimeSpan.FromDays(1));
-            
+
+
             IValidationRequest validationRequest = null;
             validator
                 .Setup(v => v.GetResultAsync(It.IsAny<IValidationRequest>()))
@@ -308,10 +309,20 @@ public async Task UsesProperNupkgUrl()
                 .ReturnsAsync(ValidationResult.Incomplete);
 
             var processor = CreateProcessor();
+            var expectedEndOfAccessLower = DateTimeOffset.UtcNow.Add(Configuration.TimeoutValidationSetAfter);
+
             await processor.ProcessValidationsAsync(ValidationSet, Package);
 
+            var expectedEndOfAccessUpper = DateTimeOffset.UtcNow.Add(Configuration.TimeoutValidationSetAfter);
+
             validator
                 .Verify(v => v.GetResultAsync(It.IsAny<IValidationRequest>()), Times.AtLeastOnce());
+            PackageFileServiceMock
+                .Verify(s =>
+                    s.GetPackageForValidationSetReadUriAsync(
+                        ValidationSet,
+                        It.Is<DateTimeOffset>(actualEndOfAccess => actualEndOfAccess >= expectedEndOfAccessLower && actualEndOfAccess <= expectedEndOfAccessUpper)),
+                    Times.Once);
             Assert.NotNull(validationRequest);
             Assert.Contains(ValidationSet.ValidationTrackingId.ToString(), validationRequest.NupkgUrl);
             Assert.Contains(ValidationContainerName, validationRequest.NupkgUrl);
@@ -354,7 +365,8 @@ protected ValidationSetProcessorFactsBase(
             {
                 Validations = new List<ValidationConfigurationItem>
                 {
-                }
+                },
+                TimeoutValidationSetAfter = TimeSpan.FromDays(5),
             };
             ConfigurationAccessorMock
                 .SetupGet(ca => ca.Value)