Skip to content

Commit a373623

Browse files
bordingbording
committed
Increase assert range to avoid flaky tests
1 parent e170336 commit a373623

File tree

3 files changed

+59
-45
lines changed

3 files changed

+59
-45
lines changed

‎LibGit2Sharp.Tests/CommitFixture.cs

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
using System.IO;
44
using System.Linq;
55
using System.Text;
6-
using LibGit2Sharp.Core;
76
using LibGit2Sharp.Tests.TestHelpers;
87
using Xunit;
9-
using Xunit.Extensions;
108

119
namespace LibGit2Sharp.Tests
1210
{
@@ -150,10 +148,10 @@ public void CanEnumerateCommitsWithReverseTimeSorting()
150148
using (var repo = new Repository(path))
151149
{
152150
foreach (Commit commit in repo.Commits.QueryBy(new CommitFilter
153-
{
154-
IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
155-
SortBy = CommitSortStrategies.Time | CommitSortStrategies.Reverse
156-
}))
151+
{
152+
IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
153+
SortBy = CommitSortStrategies.Time | CommitSortStrategies.Reverse
154+
}))
157155
{
158156
Assert.NotNull(commit);
159157
Assert.StartsWith(reversedShas[count], commit.Sha);
@@ -170,10 +168,10 @@ public void CanEnumerateCommitsWithReverseTopoSorting()
170168
using (var repo = new Repository(path))
171169
{
172170
List<Commit> commits = repo.Commits.QueryBy(new CommitFilter
173-
{
174-
IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
175-
SortBy = CommitSortStrategies.Time | CommitSortStrategies.Reverse
176-
}).ToList();
171+
{
172+
IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
173+
SortBy = CommitSortStrategies.Time | CommitSortStrategies.Reverse
174+
}).ToList();
177175
foreach (Commit commit in commits)
178176
{
179177
Assert.NotNull(commit);
@@ -216,10 +214,10 @@ public void CanEnumerateCommitsWithTimeSorting()
216214
using (var repo = new Repository(path))
217215
{
218216
foreach (Commit commit in repo.Commits.QueryBy(new CommitFilter
219-
{
220-
IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
221-
SortBy = CommitSortStrategies.Time
222-
}))
217+
{
218+
IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
219+
SortBy = CommitSortStrategies.Time
220+
}))
223221
{
224222
Assert.NotNull(commit);
225223
Assert.StartsWith(expectedShas[count], commit.Sha);
@@ -236,10 +234,10 @@ public void CanEnumerateCommitsWithTopoSorting()
236234
using (var repo = new Repository(path))
237235
{
238236
List<Commit> commits = repo.Commits.QueryBy(new CommitFilter
239-
{
240-
IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
241-
SortBy = CommitSortStrategies.Topological
242-
}).ToList();
237+
{
238+
IncludeReachableFrom = "a4a7dce85cf63874e984719f4fdd239f5145052f",
239+
SortBy = CommitSortStrategies.Topological
240+
}).ToList();
243241
foreach (Commit commit in commits)
244242
{
245243
Assert.NotNull(commit);
@@ -331,9 +329,12 @@ public void CanEnumerateCommitsFromTwoHeads()
331329
public void CanEnumerateCommitsFromMixedStartingPoints()
332330
{
333331
AssertEnumerationOfCommits(
334-
repo => new CommitFilter { IncludeReachableFrom = new object[] { repo.Branches["br2"],
332+
repo => new CommitFilter
333+
{
334+
IncludeReachableFrom = new object[] { repo.Branches["br2"],
335335
"refs/heads/master",
336-
new ObjectId("e90810b8df3e80c413d903f631643c716887138d") } },
336+
new ObjectId("e90810b8df3e80c413d903f631643c716887138d") }
337+
},
337338
new[]
338339
{
339340
"4c062a6", "e90810b", "6dcf9bf", "a4a7dce",
@@ -389,9 +390,9 @@ public void CanEnumerateAllCommits()
389390
{
390391
AssertEnumerationOfCommits(
391392
repo => new CommitFilter
392-
{
393-
IncludeReachableFrom = repo.Refs.OrderBy(r => r.CanonicalName, StringComparer.Ordinal),
394-
},
393+
{
394+
IncludeReachableFrom = repo.Refs.OrderBy(r => r.CanonicalName, StringComparer.Ordinal),
395+
},
395396
new[]
396397
{
397398
"44d5d18", "bb65291", "532740a", "503a16f", "3dfd6fd",
@@ -680,8 +681,12 @@ public void CanCommitALittleBit()
680681
Assert.Equal(identity.Name, reflogEntry.Committer.Name);
681682
Assert.Equal(identity.Email, reflogEntry.Committer.Email);
682683

683-
var now = DateTimeOffset.Now;
684-
Assert.InRange(reflogEntry.Committer.When, before, now);
684+
// When verifying the timestamp range, give a little more room on the range.
685+
// Git or file system datetime truncation seems to cause these stamps to jump up to a second earlier
686+
// than we expect. See https://github.com/libgit2/libgit2sharp/issues/1764
687+
var low = before - TimeSpan.FromSeconds(1);
688+
var high = DateTimeOffset.Now.TruncateMilliseconds() + TimeSpan.FromSeconds(1);
689+
Assert.InRange(reflogEntry.Committer.When, low, high);
685690

686691
Assert.Equal(commit.Id, reflogEntry.To);
687692
Assert.Equal(ObjectId.Zero, reflogEntry.From);
@@ -859,21 +864,21 @@ public void CanRetrieveChildrenOfASpecificCommit()
859864
const string parentSha = "5b5b025afb0b4c913b4c338a42934a3863bf3644";
860865

861866
var filter = new CommitFilter
862-
{
863-
/* Revwalk from all the refs (git log --all) ... */
864-
IncludeReachableFrom = repo.Refs,
867+
{
868+
/* Revwalk from all the refs (git log --all) ... */
869+
IncludeReachableFrom = repo.Refs,
865870

866-
/* ... and stop when the parent is reached */
867-
ExcludeReachableFrom = parentSha
868-
};
871+
/* ... and stop when the parent is reached */
872+
ExcludeReachableFrom = parentSha
873+
};
869874

870875
var commits = repo.Commits.QueryBy(filter);
871876

872877
var children = from c in commits
873-
from p in c.Parents
874-
let pId = p.Id
875-
where pId.Sha == parentSha
876-
select c;
878+
from p in c.Parents
879+
let pId = p.Id
880+
where pId.Sha == parentSha
881+
select c;
877882

878883
var expectedChildren = new[] { "c47800c7266a2be04c571c04d5a6614691ea99bd",
879884
"4a202b346bb0fb0db7eff3cffeb3c70babbd2045" };

‎LibGit2Sharp.Tests/ReflogFixture.cs

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Linq;
44
using LibGit2Sharp.Tests.TestHelpers;
55
using Xunit;
6-
using Xunit.Extensions;
76

87
namespace LibGit2Sharp.Tests
98
{
@@ -59,7 +58,7 @@ public void CommitShouldCreateReflogEntryOnHeadAndOnTargetedDirectReference()
5958

6059
var identity = Constants.Identity;
6160

62-
using (var repo = new Repository(repoPath, new RepositoryOptions{ Identity = identity }))
61+
using (var repo = new Repository(repoPath, new RepositoryOptions { Identity = identity }))
6362
{
6463
// setup refs as HEAD => unit_test => master
6564
var newRef = repo.Refs.Add("refs/heads/unit_test", "refs/heads/master");
@@ -84,8 +83,12 @@ public void CommitShouldCreateReflogEntryOnHeadAndOnTargetedDirectReference()
8483
Assert.Equal(identity.Name, reflogEntry.Committer.Name);
8584
Assert.Equal(identity.Email, reflogEntry.Committer.Email);
8685

87-
var now = DateTimeOffset.Now;
88-
Assert.InRange(reflogEntry.Committer.When, before, now);
86+
// When verifying the timestamp range, give a little more room on the range.
87+
// Git or file system datetime truncation seems to cause these stamps to jump up to a second earlier
88+
// than we expect. See https://github.com/libgit2/libgit2sharp/issues/1764
89+
var low = before - TimeSpan.FromSeconds(1);
90+
var high = DateTimeOffset.Now.TruncateMilliseconds() + TimeSpan.FromSeconds(1);
91+
Assert.InRange(reflogEntry.Committer.When, low, high);
8992

9093
Assert.Equal(commit.Id, reflogEntry.To);
9194
Assert.Equal(ObjectId.Zero, reflogEntry.From);
@@ -97,7 +100,7 @@ public void CommitShouldCreateReflogEntryOnHeadAndOnTargetedDirectReference()
97100
Assert.Equal(identity.Name, reflogEntry.Committer.Name);
98101
Assert.Equal(identity.Email, reflogEntry.Committer.Email);
99102

100-
Assert.InRange(reflogEntry.Committer.When, before, now);
103+
Assert.InRange(reflogEntry.Committer.When, low, high);
101104

102105
Assert.Equal(commit.Id, reflogEntry.To);
103106
Assert.Equal(ObjectId.Zero, reflogEntry.From);
@@ -160,8 +163,12 @@ public void CommitOnDetachedHeadShouldInsertReflogEntry()
160163
Assert.Equal(identity.Name, reflogEntry.Committer.Name);
161164
Assert.Equal(identity.Email, reflogEntry.Committer.Email);
162165

163-
var now = DateTimeOffset.Now;
164-
Assert.InRange(reflogEntry.Committer.When, before, now);
166+
// When verifying the timestamp range, give a little more room on the range.
167+
// Git or file system datetime truncation seems to cause these stamps to jump up to a second earlier
168+
// than we expect. See https://github.com/libgit2/libgit2sharp/issues/1764
169+
var low = before - TimeSpan.FromSeconds(1);
170+
var high = DateTimeOffset.Now.TruncateMilliseconds() + TimeSpan.FromSeconds(1);
171+
Assert.InRange(reflogEntry.Committer.When, low, high);
165172

166173
Assert.Equal(commit.Id, reflogEntry.To);
167174
Assert.Equal(string.Format("commit: {0}", commitMessage), repo.Refs.Log("HEAD").First().Message);
@@ -202,7 +209,7 @@ public void AppendingToReflogDependsOnCoreLogAllRefUpdatesSetting(bool isBare, b
202209
public void UnsignedMethodsWriteCorrectlyToTheReflog()
203210
{
204211
var repoPath = InitNewRepository(true);
205-
using (var repo = new Repository(repoPath, new RepositoryOptions{ Identity = Constants.Identity }))
212+
using (var repo = new Repository(repoPath, new RepositoryOptions { Identity = Constants.Identity }))
206213
{
207214
EnableRefLog(repo);
208215

‎LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,10 +471,12 @@ protected static void AssertRefLogEntry(IRepository repo, string canonicalName,
471471

472472
Assert.Equal(committer.Email, reflogEntry.Committer.Email);
473473

474-
// When verifying the timestamp range, give a little more room on the 'before' side.
474+
// When verifying the timestamp range, give a little more room on the range.
475475
// Git or file system datetime truncation seems to cause these stamps to jump up to a second earlier
476476
// than we expect. See https://github.com/libgit2/libgit2sharp/issues/1764
477-
Assert.InRange(reflogEntry.Committer.When, before - TimeSpan.FromSeconds(1), DateTimeOffset.Now);
477+
var low = before - TimeSpan.FromSeconds(1);
478+
var high = DateTimeOffset.Now.TruncateMilliseconds() + TimeSpan.FromSeconds(1);
479+
Assert.InRange(reflogEntry.Committer.When, low, high);
478480
}
479481

480482
protected static void EnableRefLog(IRepository repository, bool enable = true)

0 commit comments

Comments
 (0)