From daa03038aca727597a9f0b0b99c4c20cd6c9c5f9 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Sat, 12 Jun 2021 13:12:34 -0600 Subject: [PATCH] Fix up submodule handling in managed git Fixes #125 by enabling the test that now passes. --- src/NerdBank.GitVersioning.Tests/VersionOracleTests.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/NerdBank.GitVersioning.Tests/VersionOracleTests.cs b/src/NerdBank.GitVersioning.Tests/VersionOracleTests.cs index 937b0575..4f10abf1 100644 --- a/src/NerdBank.GitVersioning.Tests/VersionOracleTests.cs +++ b/src/NerdBank.GitVersioning.Tests/VersionOracleTests.cs @@ -49,19 +49,17 @@ public void NotRepo() Assert.Equal(0, oracle.VersionHeight); } - [Fact(Skip = "Unstable test. See issue #125")] + [Fact] public void Submodule_RecognizedWithCorrectVersion() { using (var expandedRepo = TestUtilities.ExtractRepoArchive("submodules")) { - this.Context = this.CreateGitContext(expandedRepo.RepoPath); - - this.Context.RepoRelativeProjectDirectory = "a"; + this.Context = this.CreateGitContext(Path.Combine(expandedRepo.RepoPath, "a")); var oracleA = new VersionOracle(this.Context); Assert.Equal("1.3.1", oracleA.SimpleVersion.ToString()); Assert.Equal("e238b03e75", oracleA.GitCommitIdShort); - this.Context.RepoRelativeProjectDirectory = Path.Combine("b", "projB"); + this.Context = this.CreateGitContext(Path.Combine(expandedRepo.RepoPath, "b", "projB")); var oracleB = new VersionOracle(this.Context); Assert.Equal("2.5.2", oracleB.SimpleVersion.ToString()); Assert.Equal("3ea7f010c3", oracleB.GitCommitIdShort);