Fixing tests which were affected by a git race condition. See #339 (comment) for info

Author: JakeGinnivan

GitVersionCore.Tests/Fixtures/BaseGitFlowRepositoryFixture.cs

@@ -1,15 +1,30 @@
 using System;
 using System.IO;
+using System.Text;
 using GitVersion;
+using GitVersion.Helpers;
 using LibGit2Sharp;
 
+/// <summary>
+/// Creates a repo with a develop branch off master which is a single commit ahead of master
+/// </summary>
 public class BaseGitFlowRepositoryFixture : EmptyRepositoryFixture
 {
+    /// <summary>
+    /// Creates a repo with a develop branch off master which is a single commit ahead of master
+    /// 
+    /// Master will be tagged with the initial version before branching develop
+    /// </summary>
     public BaseGitFlowRepositoryFixture(string initialVersion) : base(new Config())
     {
         SetupRepo(r => r.MakeATaggedCommit(initialVersion));
     }
 
+    /// <summary>
+    /// Creates a repo with a develop branch off master which is a single commit ahead of master
+    /// 
+    /// The initial setup actions will be performed before branching develop
+    /// </summary>
     public BaseGitFlowRepositoryFixture(Action<IRepository> initialMasterAction) : base(new Config())
     {
         SetupRepo(initialMasterAction);
@@ -24,5 +39,21 @@ void SetupRepo(Action<IRepository> initialMasterAction)
         initialMasterAction(Repository);
 
         Repository.CreateBranch("develop").Checkout();
+        Repository.MakeACommit();
+    }
+
+    public void DumpGraph()
+    {
+        var output = new StringBuilder();
+
+        ProcessHelper.Run(
+            o => output.AppendLine(o),
+            e => output.AppendLineFormat("ERROR: {0}", e),
+            null,
+            "git",
+            @"log --graph --abbrev-commit --decorate --date=relative --all",
+            RepositoryPath);
+
+        Console.Write(output.ToString());
     }
 }

GitVersionCore.Tests/IntegrationTests/GitFlow/PatchScenarios.cs

@@ -14,13 +14,13 @@ public void PatchLatestReleaseExample()
             // create hotfix
             fixture.Repository.CreateBranch("hotfix-1.2.1").Checkout();
 
-            fixture.AssertFullSemver("1.2.1-beta.1+0");
-            fixture.Repository.MakeACommit();
             fixture.AssertFullSemver("1.2.1-beta.1+1");
+            fixture.Repository.MakeACommit();
+            fixture.AssertFullSemver("1.2.1-beta.1+2");
             fixture.Repository.ApplyTag("1.2.1-beta.1");
-            fixture.AssertFullSemver("1.2.1-beta.1+1");
+            fixture.AssertFullSemver("1.2.1-beta.1+2");
             fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.2.1-beta.2+2");
+            fixture.AssertFullSemver("1.2.1-beta.2+3");
 
             // Merge hotfix branch to master
             fixture.Repository.Checkout("master");
@@ -77,7 +77,7 @@ public void PatchOlderReleaseExample()
 
             // Verify develop version
             fixture.Repository.Checkout("develop");
-            fixture.AssertFullSemver("1.3.0-unstable.0+0");
+            fixture.AssertFullSemver("1.3.0-unstable.1+1");
         }
     }
 }

GitVersionCore.Tests/IntegrationTests/GitFlow/SupportBranchScenarios.cs

@@ -10,18 +10,18 @@ public class SupportBranchScenarios
         public void SupportIsCalculatedCorrectly()
         {
             using (var fixture = new BaseGitFlowRepositoryFixture("1.1.0"))
-            {   
+            {
                 // Create 2.0.0 release
                 fixture.Repository.CreateBranch("release-2.0.0").Checkout();
                 fixture.Repository.MakeCommits(2);
-                
+
                 // Merge into develop and master
                 fixture.Repository.Checkout("master");
                 fixture.Repository.MergeNoFF("release-2.0.0");
                 fixture.Repository.ApplyTag("2.0.0");
                 fixture.Repository.Checkout("develop");
                 fixture.Repository.MergeNoFF("release-2.0.0");
-                fixture.AssertFullSemver("2.1.0-unstable.0+0");
+                fixture.AssertFullSemver("2.1.0-unstable.1+1");
 
                 // Now lets support 1.x release
                 fixture.Repository.Checkout("1.1.0");
@@ -47,6 +47,6 @@ public void SupportIsCalculatedCorrectly()
                 fixture.Repository.MergeNoFF("hotfix/1.2.1");
                 fixture.AssertFullSemver("1.2.1");
             }
-        } 
+        }
     }
 }

GitVersionCore/GitVersionCore.csproj

@@ -78,6 +78,7 @@
     <Compile Include="GitFlow\BranchFinders\RecentTagVersionExtractor.cs" />
     <Compile Include="Helpers\FileSystem.cs" />
     <Compile Include="Helpers\IFileSystem.cs" />
+    <Compile Include="Helpers\ProcessHelper.cs" />
     <Compile Include="LastMinorVersionFinder.cs" />
     <Compile Include="SemanticVersionExtensions.cs" />
     <Compile Include="VersioningModes\ContinuousDeliveryMode.cs" />

GitVersionExe/ProcessHelper.cs renamed to GitVersionCore/Helpers/ProcessHelper.cs

@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion.Helpers
 {
     using System;
     using System.Collections.Generic;
@@ -7,7 +7,7 @@ namespace GitVersion
     using System.Runtime.InteropServices;
     using System.Threading;
 
-    static class ProcessHelper
+    public static class ProcessHelper
     {
         static volatile object lockObject = new object();
 

GitVersionExe.Tests/GitVersionHelper.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using GitVersion;
+using GitVersion.Helpers;
 using LibGit2Sharp;
 
 public static class GitVersionHelper

GitVersionExe/GitVersionExe.csproj

@@ -57,7 +57,6 @@
     <Compile Include="ExtensionMethods.cs" />
     <Compile Include="GitPreparer.cs" />
     <Compile Include="HelpWriter.cs" />
-    <Compile Include="ProcessHelper.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="AssemblyInfoFileUpdate.cs" />