Merge pull request #281 from NuGet/dev

[ReleasePrep][2017.12.06] RI of dev into master

Author: loic-sharma

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

@@ -138,15 +138,7 @@ private async Task MoveFileToPublicStorageAndMarkPackageAsAvailable(PackageValid
 
         private bool AllValidationsSucceeded(PackageValidationSet packageValidationSet)
         {
-            var completeValidations = new HashSet<string>(packageValidationSet
-                .PackageValidations
-                .Where(v => v.ValidationStatus == ValidationStatus.Succeeded)
-                .Select(v => v.Type));
-            var requiredValidations = _validationConfiguration
-                .Validations
-                .Select(v => v.Name);
-
-            return completeValidations.IsSupersetOf(requiredValidations);
+            return packageValidationSet.PackageValidations.All(pv => pv.ValidationStatus == ValidationStatus.Succeeded);
         }
 
         private IEnumerable<PackageValidation> GetFailedValidations(PackageValidationSet packageValidationSet)

src/Validation.PackageSigning.ExtractAndValidateSignature/Validation.PackageSigning.ExtractAndValidateSignature.csproj

@@ -96,7 +96,7 @@
       <Version>1.1.2</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Packaging">
-      <Version>4.6.0-preview1-4690</Version>
+      <Version>4.6.0-preview2-4699</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Configuration">
       <Version>2.5.0</Version>

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

@@ -227,6 +227,58 @@ public async Task DoesNotTakeDownAvailablePackages()
                 .Verify(ps => ps.UpdatePackageStatusAsync(Package, PackageStatus.FailedValidation, It.IsAny<bool>()), Times.Never());
         }
 
+        [Theory]
+        [InlineData(2, 1, 0, ValidationStatus.Incomplete, PackageStatus.Validating)]
+        [InlineData(2, 1, 1, ValidationStatus.Incomplete, PackageStatus.Available)]
+        [InlineData(3, 2, 0, ValidationStatus.Incomplete, PackageStatus.Validating)]
+        [InlineData(3, 2, 1, ValidationStatus.Incomplete, PackageStatus.Validating)]
+        [InlineData(3, 2, 2, ValidationStatus.Incomplete, PackageStatus.Available)]
+        [InlineData(2, 1, 0, ValidationStatus.Failed, PackageStatus.FailedValidation)]
+        [InlineData(3, 2, 0, ValidationStatus.Failed, PackageStatus.FailedValidation)]
+        [InlineData(3, 2, 1, ValidationStatus.Failed, PackageStatus.FailedValidation)]
+        public async Task PrefersDbOverConfigurationForDeterminingSuccess(
+            int numConfiguredValidators,
+            int numDbValidators,
+            int numSucceededValidators,
+            ValidationStatus notSucceededStatus,
+            PackageStatus expectedStatus)
+        {
+            for (int cfgValidatorIndex = 0; cfgValidatorIndex < numConfiguredValidators; ++cfgValidatorIndex)
+            {
+                Configuration.Validations.Add(new ValidationConfigurationItem
+                {
+                    Name = "validation" + cfgValidatorIndex,
+                    FailAfter = TimeSpan.FromDays(1),
+                    RequiredValidations = new List<string> { }
+                });
+            }
+
+            for (int dbValidatorIndex = 0; dbValidatorIndex < numDbValidators; ++dbValidatorIndex)
+            {
+                ValidationSet.PackageValidations.Add(new PackageValidation
+                {
+                    Type = "validation" + dbValidatorIndex,
+                    ValidationStatus = dbValidatorIndex < numSucceededValidators ? ValidationStatus.Succeeded : notSucceededStatus
+                });
+            }
+
+            var processor = CreateProcessor();
+            await processor.ProcessValidationOutcomeAsync(ValidationSet, Package);
+
+            if (expectedStatus != PackageStatus.Validating)
+            {
+                PackageServiceMock
+                    .Verify(ps => ps.UpdatePackageStatusAsync(Package, expectedStatus, true), Times.Once());
+                PackageServiceMock
+                    .Verify(ps => ps.UpdatePackageStatusAsync(It.IsAny<Package>(), It.IsAny<PackageStatus>(), It.IsAny<bool>()), Times.Once());
+            }
+            else
+            {
+                PackageServiceMock
+                    .Verify(ps => ps.UpdatePackageStatusAsync(It.IsAny<Package>(), It.IsAny<PackageStatus>(), It.IsAny<bool>()), Times.Never());
+            }
+        }
+
         public ValidationOutcomeProcessorFacts()
         {
             PackageServiceMock = new Mock<ICorePackageService>();