Skip to content

Commit 61f831d

Browse files
committed
fix(source-control): retry incomplete gitcafe line counts
1 parent 0646741 commit 61f831d

2 files changed

Lines changed: 45 additions & 9 deletions

File tree

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts‎

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -842,8 +842,8 @@ describe("GitCafePullRequestProvider", () => {
842842
}).pipe(Effect.provide(server.layer));
843843
});
844844

845-
it.effect.each(["changes", "diff-files"] as const)(
846-
"retries line stats after a failed %s read and retains the complete retry",
845+
it.effect.each(["changes", "diff-files", "partial-changes", "partial-diff-files"] as const)(
846+
"retries line stats after a failed or incomplete %s read and retains the complete retry",
847847
(failedRead) => {
848848
const snapshot = { version: 4, headOid, comparisonBaseOid: baseOid };
849849
let recovered = false;
@@ -857,33 +857,64 @@ describe("GitCafePullRequestProvider", () => {
857857
"GET /repos/owner/repo/pulls/7/changes": () =>
858858
!recovered && failedRead === "changes"
859859
? {}
860-
: { ...snapshot, items: [{ path: "file.ts" }], next: null },
860+
: {
861+
...snapshot,
862+
items: [
863+
failedRead === "partial-changes"
864+
? { path: "file.ts", additions: 5, ...(recovered ? { deletions: 2 } : {}) }
865+
: { path: "file.ts" },
866+
...(failedRead === "partial-changes"
867+
? [{ path: "image.png", binary: true }]
868+
: []),
869+
],
870+
next: null,
871+
},
861872
"POST /repos/owner/repo/pulls/7/diff-files": () =>
862873
!recovered && failedRead === "diff-files"
863874
? {}
864-
: { ...snapshot, items: [{ path: "file.ts", additions: 5, deletions: 2 }] },
875+
: {
876+
...snapshot,
877+
items: [
878+
{
879+
path: "file.ts",
880+
additions: 5,
881+
...(!recovered && failedRead === "partial-diff-files" ? {} : { deletions: 2 }),
882+
},
883+
],
884+
},
865885
});
866886
return Effect.gen(function* () {
867887
const provider = yield* GitCafePullRequestProvider.make;
888+
const firstReadStart = server.sent.length;
868889
assert.deepInclude(yield* provider.getChangeRequest(target), {
869-
additions: 0,
870-
changedFiles: failedRead === "changes" ? 0 : 1,
890+
additions: failedRead.startsWith("partial-") ? 5 : 0,
891+
deletions: 0,
892+
changedFiles: failedRead === "changes" ? 0 : failedRead === "partial-changes" ? 2 : 1,
871893
});
894+
assert.strictEqual(
895+
server.sent.length - firstReadStart,
896+
failedRead === "changes" || failedRead === "partial-changes" ? 4 : 5,
897+
);
872898
recovered = true;
873899
for (let read = 0; read < 2; read++) {
900+
const readStart = server.sent.length;
874901
assert.deepInclude(yield* provider.getChangeRequest(target), {
875902
additions: 5,
876903
deletions: 2,
877-
changedFiles: 1,
904+
changedFiles: failedRead === "partial-changes" ? 2 : 1,
878905
});
906+
assert.strictEqual(
907+
server.sent.length - readStart,
908+
read === 1 ? 3 : failedRead === "partial-changes" ? 4 : 5,
909+
);
879910
}
880911
assert.strictEqual(
881912
server.sent.filter((request) => request.path.endsWith("/changes")).length,
882913
2,
883914
);
884915
assert.strictEqual(
885916
server.sent.filter((request) => request.path.endsWith("/diff-files")).length,
886-
failedRead === "changes" ? 1 : 2,
917+
failedRead === "partial-changes" ? 0 : failedRead === "changes" ? 1 : 2,
887918
);
888919
}).pipe(Effect.provide(server.layer));
889920
},

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,12 @@ export const make = Effect.gen(function* () {
440440
: [];
441441
return {
442442
revision,
443-
complete: Option.isSome(details) && after === null,
443+
complete:
444+
Option.isSome(details) &&
445+
after === null &&
446+
counted.every(
447+
(file) => file.binary || (file.additions !== undefined && file.deletions !== undefined),
448+
),
444449
changedFiles: files.length,
445450
additions: counted.reduce((total, file) => total + (file.additions ?? 0), 0),
446451
deletions: counted.reduce((total, file) => total + (file.deletions ?? 0), 0),

0 commit comments

Comments
 (0)