From b0828359ba4dfa68b0111de185b122f0867da2ea Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 10:14:56 +0200 Subject: [PATCH 01/12] Revive unit tests for dynamic repositories --- .../DynamicRepositoryTests.cs | 44 ++++++++++++------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs index a8a2782ca8..3d1f5189ee 100644 --- a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs +++ b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs @@ -1,4 +1,5 @@ -using System.IO; +using System.Diagnostics; +using System.IO; using GitVersion; using GitVersionCore.Tests; using NUnit.Framework; @@ -9,7 +10,7 @@ public class DynamicRepositoryTests : TestBase string workDirectory; - [SetUp] + [OneTimeSetUp] public void CreateTemporaryRepository() { // Note: we can't use guid because paths will be too long @@ -17,30 +18,41 @@ public void CreateTemporaryRepository() } - //[TearDown] - //public void Cleanup() - //{ - // Directory.Delete(workDirectory, true); - //} + [OneTimeTearDown] + public void Cleanup() + { + Directory.Delete(workDirectory, true); + } - [Ignore("These tests are slow and fail on the second run in Test Explorer and need to be re-written")] - [TestCase("GV_master_1", "https://github.com/GitTools/GitVersion", "master", "4783d325521463cd6cf1b61074352da84451f25d", "4.0.0+1126")] - [TestCase("GV_master_2", "https://github.com/GitTools/GitVersion", "master", "3bdcd899530b4e9b37d13639f317da04a749e728", "4.0.0+1132")] + //[Ignore("These tests are slow and fail on the second run in Test Explorer and need to be re-written")] + [NonParallelizable] + [TestCase("GV_master_1", "https://github.com/GitTools/GitVersion", "master", "4783d325521463cd6cf1b61074352da84451f25d", "4.0.0+1086")] + [TestCase("GV_master_2", "https://github.com/GitTools/GitVersion", "master", "3bdcd899530b4e9b37d13639f317da04a749e728", "4.0.0+1092")] + // Note: use same name twice to see if changing commits works on same (cached) repository + [TestCase("Catel_develop_1", "https://github.com/Catel/Catel", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "5.12.0-alpha.188")] + [TestCase("Catel_develop_1", "https://github.com/Catel/Catel", "develop", "71e71359f37581784e18c94e7a45eee72cbeeb30", "5.12.0-alpha.192")] + [TestCase("Catel_master_1", "https://github.com/Catel/Catel", "master", "f5de8964c35180a5f8607f5954007d5828aa849f", "5.10.0")] public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer) { var root = Path.Combine(workDirectory, name); var dynamicDirectory = Path.Combine(root, "dynamic"); var workingDirectory = Path.Combine(root, "working"); - // Clear upfront - if (Directory.Exists(root)) - { - Directory.Delete(root, true); - } + //// Clear upfront + //if (Directory.Exists(root)) + //{ + // Directory.Delete(root, true); + //} Directory.CreateDirectory(dynamicDirectory); Directory.CreateDirectory(workingDirectory); + Logger.AddLoggersTemporarily( + x => Debug.WriteLine($"[DEBUG] {x}"), + x => Debug.WriteLine($"[INFO] {x}"), + x => Debug.WriteLine($"[WARNING] {x}"), + x => Debug.WriteLine($"[ERROR] {x}")); + var executeCore = new ExecuteCore(new TestFileSystem()); var versionVariables = executeCore.ExecuteGitVersion(url, dynamicDirectory, null, targetBranch, @@ -48,4 +60,4 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran Assert.AreEqual(expectedFullSemVer, versionVariables.FullSemVer); } -} \ No newline at end of file +} From 6005029b056050fc115ac310cfe64de572e15442 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 10:15:15 +0200 Subject: [PATCH 02/12] Never pass in null for authentication of dynamic repositories --- src/GitVersionCore/GitPreparer.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/GitVersionCore/GitPreparer.cs b/src/GitVersionCore/GitPreparer.cs index cc2e6187ef..86cbaeda67 100644 --- a/src/GitVersionCore/GitPreparer.cs +++ b/src/GitVersionCore/GitPreparer.cs @@ -20,12 +20,11 @@ public GitPreparer(string targetUrl, string dynamicRepositoryLocation, Authentic { this.targetUrl = targetUrl; this.dynamicRepositoryLocation = dynamicRepositoryLocation; - this.authentication = authentication == null ? - null : + this.authentication = new AuthenticationInfo { - Username = authentication.Username, - Password = authentication.Password + Username = authentication?.Username, + Password = authentication?.Password }; this.noFetch = noFetch; this.targetPath = targetPath.TrimEnd('/', '\\'); From 857643f5ce1ccf68e84306041fb6500c901a2dc5 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 10:29:49 +0200 Subject: [PATCH 03/12] Shorten directory names --- src/GitVersionCore.Tests/DynamicRepositoryTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs index 3d1f5189ee..fe278a96e6 100644 --- a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs +++ b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs @@ -14,7 +14,7 @@ public class DynamicRepositoryTests : TestBase public void CreateTemporaryRepository() { // Note: we can't use guid because paths will be too long - workDirectory = Path.Combine(Path.GetTempPath(), "DynRepoTests"); + workDirectory = Path.Combine(Path.GetTempPath(), "GV"); } @@ -35,8 +35,8 @@ public void Cleanup() public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer) { var root = Path.Combine(workDirectory, name); - var dynamicDirectory = Path.Combine(root, "dynamic"); - var workingDirectory = Path.Combine(root, "working"); + var dynamicDirectory = Path.Combine(root, "D"); // dynamic, keeping directory as short as possible + var workingDirectory = Path.Combine(root, "W"); // working, keeping directory as short as possible //// Clear upfront //if (Directory.Exists(root)) From 72cedf0feda28a39edcd5ae906f0319dc69f7b98 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 10:38:00 +0200 Subject: [PATCH 04/12] Clean temp directory before running tests to fix build on Azure pipelines --- src/GitVersionCore.Tests/DynamicRepositoryTests.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs index fe278a96e6..7e34bbd911 100644 --- a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs +++ b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs @@ -15,13 +15,16 @@ public void CreateTemporaryRepository() { // Note: we can't use guid because paths will be too long workDirectory = Path.Combine(Path.GetTempPath(), "GV"); + + // Clean directory upfront, some build agents are having troubles + Directory.Delete(workDirectory, true); } [OneTimeTearDown] public void Cleanup() { - Directory.Delete(workDirectory, true); + } //[Ignore("These tests are slow and fail on the second run in Test Explorer and need to be re-written")] From 205c66770e405a478ee948825f161917f5379ee9 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 10:45:29 +0200 Subject: [PATCH 05/12] Fix directory creation and cleanup in tests --- src/GitVersionCore.Tests/DynamicRepositoryTests.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs index 7e34bbd911..8ba9c8e82c 100644 --- a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs +++ b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs @@ -17,7 +17,12 @@ public void CreateTemporaryRepository() workDirectory = Path.Combine(Path.GetTempPath(), "GV"); // Clean directory upfront, some build agents are having troubles - Directory.Delete(workDirectory, true); + if (Directory.Exists(workDirectory)) + { + Directory.Delete(workDirectory, true); + } + + Directory.CreateDirectory(workDirectory); } From b23408c483782482bddcb5ce4c82c4390302459a Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 11:03:47 +0200 Subject: [PATCH 06/12] Add more dynamic repository tests --- src/GitVersionCore.Tests/DynamicRepositoryTests.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs index 8ba9c8e82c..4afa7cfb22 100644 --- a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs +++ b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs @@ -32,14 +32,16 @@ public void Cleanup() } + // Note: use same name twice to see if changing commits works on same (cached) repository //[Ignore("These tests are slow and fail on the second run in Test Explorer and need to be re-written")] [NonParallelizable] - [TestCase("GV_master_1", "https://github.com/GitTools/GitVersion", "master", "4783d325521463cd6cf1b61074352da84451f25d", "4.0.0+1086")] - [TestCase("GV_master_2", "https://github.com/GitTools/GitVersion", "master", "3bdcd899530b4e9b37d13639f317da04a749e728", "4.0.0+1092")] - // Note: use same name twice to see if changing commits works on same (cached) repository - [TestCase("Catel_develop_1", "https://github.com/Catel/Catel", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "5.12.0-alpha.188")] - [TestCase("Catel_develop_1", "https://github.com/Catel/Catel", "develop", "71e71359f37581784e18c94e7a45eee72cbeeb30", "5.12.0-alpha.192")] - [TestCase("Catel_master_1", "https://github.com/Catel/Catel", "master", "f5de8964c35180a5f8607f5954007d5828aa849f", "5.10.0")] + [TestCase("GV_master", "https://github.com/GitTools/GitVersion", "master", "4783d325521463cd6cf1b61074352da84451f25d", "4.0.0+1086")] + [TestCase("GV_master", "https://github.com/GitTools/GitVersion", "master", "3bdcd899530b4e9b37d13639f317da04a749e728", "4.0.0+1092")] + [TestCase("Ctl_develop", "https://github.com/Catel/Catel", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "5.12.0-alpha.188")] + [TestCase("Ctl_develop", "https://github.com/Catel/Catel", "develop", "71e71359f37581784e18c94e7a45eee72cbeeb30", "5.12.0-alpha.192")] + [TestCase("Ctl_master", "https://github.com/Catel/Catel", "master", "f5de8964c35180a5f8607f5954007d5828aa849f", "5.10.0")] + [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "5.12.0-alpha.188")] + [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "be0aa94642d6ff1df6209e2180a7fe0de9aab384", "5.12.0-alpha.192")] public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer) { var root = Path.Combine(workDirectory, name); From a9c92277c812c39a060cad83a7f6452cd9db377f Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 11:05:17 +0200 Subject: [PATCH 07/12] Test cleanup --- src/GitVersionCore.Tests/DynamicRepositoryTests.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs index 4afa7cfb22..48ce01f8d3 100644 --- a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs +++ b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs @@ -40,20 +40,14 @@ public void Cleanup() [TestCase("Ctl_develop", "https://github.com/Catel/Catel", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "5.12.0-alpha.188")] [TestCase("Ctl_develop", "https://github.com/Catel/Catel", "develop", "71e71359f37581784e18c94e7a45eee72cbeeb30", "5.12.0-alpha.192")] [TestCase("Ctl_master", "https://github.com/Catel/Catel", "master", "f5de8964c35180a5f8607f5954007d5828aa849f", "5.10.0")] - [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "5.12.0-alpha.188")] - [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "be0aa94642d6ff1df6209e2180a7fe0de9aab384", "5.12.0-alpha.192")] + [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "0.1.0-alpha.21")] + [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "be0aa94642d6ff1df6209e2180a7fe0de9aab384", "0.1.0-alpha.23")] public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer) { var root = Path.Combine(workDirectory, name); var dynamicDirectory = Path.Combine(root, "D"); // dynamic, keeping directory as short as possible var workingDirectory = Path.Combine(root, "W"); // working, keeping directory as short as possible - //// Clear upfront - //if (Directory.Exists(root)) - //{ - // Directory.Delete(root, true); - //} - Directory.CreateDirectory(dynamicDirectory); Directory.CreateDirectory(workingDirectory); From 32b40831749f080cd97f2554832b85813f1a9e2d Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 11:08:51 +0200 Subject: [PATCH 08/12] Fix expected output --- src/GitVersionCore.Tests/DynamicRepositoryTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs index 48ce01f8d3..05c759f007 100644 --- a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs +++ b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs @@ -40,8 +40,8 @@ public void Cleanup() [TestCase("Ctl_develop", "https://github.com/Catel/Catel", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "5.12.0-alpha.188")] [TestCase("Ctl_develop", "https://github.com/Catel/Catel", "develop", "71e71359f37581784e18c94e7a45eee72cbeeb30", "5.12.0-alpha.192")] [TestCase("Ctl_master", "https://github.com/Catel/Catel", "master", "f5de8964c35180a5f8607f5954007d5828aa849f", "5.10.0")] - [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "0.1.0-alpha.21")] - [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "be0aa94642d6ff1df6209e2180a7fe0de9aab384", "0.1.0-alpha.23")] + [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "be0aa94642d6ff1df6209e2180a7fe0de9aab384", "0.1.0-alpha.21")] + [TestCase("CtlA_develop", "https://github.com/Catel/Catel.Analyzers", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "0.1.0-alpha.23")] public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer) { var root = Path.Combine(workDirectory, name); From 9fcc48219e75db56073093b3109ee2ad8f4e78c2 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 11:36:28 +0200 Subject: [PATCH 09/12] Allow move of repository head for dynamic repositories --- src/GitVersionCore/GitPreparer.cs | 6 +++--- src/GitVersionCore/Helpers/GitRepositoryHelper.cs | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/GitVersionCore/GitPreparer.cs b/src/GitVersionCore/GitPreparer.cs index 86cbaeda67..b9f9d52c97 100644 --- a/src/GitVersionCore/GitPreparer.cs +++ b/src/GitVersionCore/GitPreparer.cs @@ -50,7 +50,7 @@ public void Initialise(bool normaliseGitDirectory, string currentBranch, bool sh { CleanupDuplicateOrigin(); } - GitRepositoryHelper.NormalizeGitDirectory(GetDotGitDirectory(), authentication, noFetch, currentBranch); + GitRepositoryHelper.NormalizeGitDirectory(GetDotGitDirectory(), authentication, noFetch, currentBranch, IsDynamicGitRepository); } } return; @@ -180,7 +180,7 @@ static string CreateDynamicRepository(string targetPath, AuthenticationInfo auth Logger.WriteInfo("Git repository already exists"); using (Logger.IndentLog($"Normalizing git directory for branch '{targetBranch}'")) { - GitRepositoryHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch, targetBranch); + GitRepositoryHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch, targetBranch, true); } return gitDirectory; @@ -191,7 +191,7 @@ static string CreateDynamicRepository(string targetPath, AuthenticationInfo auth using (Logger.IndentLog($"Normalizing git directory for branch '{targetBranch}'")) { // Normalize (download branches) before using the branch - GitRepositoryHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch, targetBranch); + GitRepositoryHelper.NormalizeGitDirectory(gitDirectory, authentication, noFetch, targetBranch, true); } return gitDirectory; diff --git a/src/GitVersionCore/Helpers/GitRepositoryHelper.cs b/src/GitVersionCore/Helpers/GitRepositoryHelper.cs index e5ee0cb386..923bd0f039 100644 --- a/src/GitVersionCore/Helpers/GitRepositoryHelper.cs +++ b/src/GitVersionCore/Helpers/GitRepositoryHelper.cs @@ -11,7 +11,8 @@ public static class GitRepositoryHelper /// Normalisation of a git directory turns all remote branches into local branches, turns pull request refs into a real branch and a few other things. This is designed to be run *only on the build server* which checks out repositories in different ways. /// It is not recommended to run normalisation against a local repository /// - public static void NormalizeGitDirectory(string gitDirectory, AuthenticationInfo authentication, bool noFetch, string currentBranch) + public static void NormalizeGitDirectory(string gitDirectory, AuthenticationInfo authentication, + bool noFetch, string currentBranch, bool isDynamicRepository) { using (var repo = new Repository(gitDirectory)) { @@ -41,7 +42,7 @@ public static void NormalizeGitDirectory(string gitDirectory, AuthenticationInfo // Bug fix for https://github.com/GitTools/GitVersion/issues/1754, head maybe have been changed // if this is a dynamic repository. But only allow this in case the branches are different (branch switch) if (expectedSha != repo.Head.Tip.Sha && - !expectedBranchName.IsBranch(currentBranch)) + (isDynamicRepository || !expectedBranchName.IsBranch(currentBranch))) { var newExpectedSha = repo.Head.Tip.Sha; var newExpectedBranchName = repo.Head.CanonicalName; From e3adfab01d61987f4c326b8a10b53a0a009a7dc9 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 11:53:37 +0200 Subject: [PATCH 10/12] Run unit tests explicitly for dynamic repositories --- src/GitVersionCore.Tests/DynamicRepositoryTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs index 05c759f007..b8d21ba25a 100644 --- a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs +++ b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs @@ -35,6 +35,7 @@ public void Cleanup() // Note: use same name twice to see if changing commits works on same (cached) repository //[Ignore("These tests are slow and fail on the second run in Test Explorer and need to be re-written")] [NonParallelizable] + [Explicit] [TestCase("GV_master", "https://github.com/GitTools/GitVersion", "master", "4783d325521463cd6cf1b61074352da84451f25d", "4.0.0+1086")] [TestCase("GV_master", "https://github.com/GitTools/GitVersion", "master", "3bdcd899530b4e9b37d13639f317da04a749e728", "4.0.0+1092")] [TestCase("Ctl_develop", "https://github.com/Catel/Catel", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "5.12.0-alpha.188")] From 52e97ef1560dd7956f9c8f329d70634b3ba8af05 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 11:58:19 +0200 Subject: [PATCH 11/12] Fix build --- .../IntegrationTests/RemoteRepositoryScenarios.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs index cf435a1a55..407e261cad 100644 --- a/src/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs +++ b/src/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs @@ -40,7 +40,7 @@ public void GivenARemoteGitRepositoryWithCommitsAndBranches_ThenClonedLocalShoul return repo; })) { - GitRepositoryHelper.NormalizeGitDirectory(fixture.LocalRepositoryFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: string.Empty); + GitRepositoryHelper.NormalizeGitDirectory(fixture.LocalRepositoryFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: string.Empty, true); fixture.AssertFullSemver("1.0.0-beta.1+5"); fixture.AssertFullSemver("1.0.0-beta.1+5", fixture.LocalRepositoryFixture.Repository); From c408e4eba8653b1e1283cd0b35fd01f7618c812f Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Wed, 7 Aug 2019 12:04:27 +0200 Subject: [PATCH 12/12] Ignore tests again, build agent is having issues --- src/GitVersionCore.Tests/DynamicRepositoryTests.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs index b8d21ba25a..76796cfae9 100644 --- a/src/GitVersionCore.Tests/DynamicRepositoryTests.cs +++ b/src/GitVersionCore.Tests/DynamicRepositoryTests.cs @@ -33,9 +33,8 @@ public void Cleanup() } // Note: use same name twice to see if changing commits works on same (cached) repository - //[Ignore("These tests are slow and fail on the second run in Test Explorer and need to be re-written")] + [Ignore("These tests are slow and fail on the second run in Test Explorer and need to be re-written")] [NonParallelizable] - [Explicit] [TestCase("GV_master", "https://github.com/GitTools/GitVersion", "master", "4783d325521463cd6cf1b61074352da84451f25d", "4.0.0+1086")] [TestCase("GV_master", "https://github.com/GitTools/GitVersion", "master", "3bdcd899530b4e9b37d13639f317da04a749e728", "4.0.0+1092")] [TestCase("Ctl_develop", "https://github.com/Catel/Catel", "develop", "0e2b6c125a730d2fa5e24394ef64abe62c98e9e9", "5.12.0-alpha.188")]