Make functional tests reuse packages they have uploaded if possible (#…

…5922)

tests/NuGetGallery.FunctionalTests.Core/Helpers/UploadHelper.cs

@@ -10,6 +10,8 @@ namespace NuGetGallery.FunctionalTests.Helpers
 {
     public static class UploadHelper
     {
+        private static readonly object UniqueLock = new object();
+
         /// <summary>
         /// Helper class for defining the properties of a test package to be uploaded.
         /// </summary>
@@ -48,23 +50,24 @@ protected PackageToUpload(PackageToUpload package)
         /// <summary>
         /// Gets a unique ID for a package to upload.
         /// </summary>
-        public static string GetUniquePackageId(string test)
+        public static string GetUniquePackageId()
         {
-            if (test == null)
+            lock (UniqueLock)
             {
-                test = "UploadPackageFromUI";
+                return $"NuGetFunctionalTest_{DateTimeOffset.UtcNow.Ticks}";
             }
-
-            return $"{test}_{DateTimeOffset.UtcNow.Ticks}";
         }
 
         /// <summary>
         /// Gets a unique version for a package to upload.
         /// </summary>
         public static string GetUniquePackageVersion()
         {
-            var ticks = DateTimeOffset.UtcNow.Ticks;
-            return $"1.0.0-v{ticks}";
+            lock (UniqueLock)
+            {
+                var ticks = DateTimeOffset.UtcNow.Ticks;
+                return $"1.0.0-v{ticks}";
+            }
         }
 
         /// <summary>

tests/NuGetGallery.FunctionalTests.Core/XunitExtensions/GalleryTestFixture.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Net;
 using System.Threading.Tasks;
+using Xunit;
 
 namespace NuGetGallery.FunctionalTests
 {
@@ -48,7 +49,12 @@ public async Task CheckIfBaseTestPackageExistsAsync()
                 var clientSdkHelper = new ClientSdkHelper(ConsoleTestOutputHelper.New);
                 if (!clientSdkHelper.CheckIfPackageExistsInSource(Constants.TestPackageId, UrlHelper.V2FeedRootUrl))
                 {
-                    await clientSdkHelper.UploadNewPackageAndVerify(Constants.TestPackageId);
+                    var testOutputHelper = ConsoleTestOutputHelper.New;
+                    var commandlineHelper = new CommandlineHelper(testOutputHelper);
+                    var packageCreationHelper = new PackageCreationHelper(testOutputHelper);
+                    var packageFullPath = await packageCreationHelper.CreatePackage(Constants.TestPackageId, "1.0.0");
+                    var processResult = await commandlineHelper.UploadPackageAsync(packageFullPath, UrlHelper.V2FeedPushSourceUrl);
+                    Assert.True(processResult.ExitCode == 0, Constants.UploadFailureMessage);
                 }
             }
             catch (Exception exception)