From f629cb39411d4ad951100161b01a12d9f4f730ef Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Fri, 24 May 2024 09:48:41 +0100 Subject: [PATCH] Add some comments to explain test case --- lib/trap-caching.test.js | 9 +++++++++ lib/trap-caching.test.js.map | 2 +- src/trap-caching.test.ts | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/trap-caching.test.js b/lib/trap-caching.test.js index e75bb443b..3b91dd3d9 100644 --- a/lib/trap-caching.test.js +++ b/lib/trap-caching.test.js @@ -173,46 +173,55 @@ function getTestConfigWithTempDir(tempDir) { }); (0, ava_1.default)("cleanup removes only old CodeQL TRAP caches", async (t) => { await util.withTmpDir(async (tmpDir) => { + // This config specifies that we are analyzing JavaScript and Ruby, but not Swift. const config = getTestConfigWithTempDir(tmpDir); sinon.stub(actionsUtil, "getRef").resolves("refs/heads/main"); sinon.stub(actionsUtil, "isAnalyzingDefaultBranch").resolves(true); const listStub = sinon.stub(apiClient, "listActionsCaches").resolves([ + // Should be kept, since it's not relevant to CodeQL. In reality, the API shouldn't return + // this in the first place, but this is a defensive check. { id: 1, key: "some-other-key", created_at: "2024-05-23T14:25:00Z", size_in_bytes: 100 * 1024 * 1024, }, + // Should be kept, since it's the newest TRAP cache for JavaScript { id: 2, key: "codeql-trap-1-2.0.0-javascript-newest", created_at: "2024-04-23T14:25:00Z", size_in_bytes: 50 * 1024 * 1024, }, + // Should be cleaned up { id: 3, key: "codeql-trap-1-2.0.0-javascript-older", created_at: "2024-03-22T14:25:00Z", size_in_bytes: 200 * 1024 * 1024, }, + // Should be cleaned up { id: 4, key: "codeql-trap-1-2.0.0-javascript-oldest", created_at: "2024-02-21T14:25:00Z", size_in_bytes: 300 * 1024 * 1024, }, + // Should be kept, since it's the newest TRAP cache for Ruby { id: 5, key: "codeql-trap-1-2.0.0-ruby-newest", created_at: "2024-02-20T14:25:00Z", size_in_bytes: 300 * 1024 * 1024, }, + // Should be kept, since we aren't analyzing Swift { id: 6, key: "codeql-trap-1-2.0.0-swift-newest", created_at: "2024-02-22T14:25:00Z", size_in_bytes: 300 * 1024 * 1024, }, + // Should be kept, since we aren't analyzing Swift { id: 7, key: "codeql-trap-1-2.0.0-swift-older", diff --git a/lib/trap-caching.test.js.map b/lib/trap-caching.test.js.map index 68a11c232..717735c9b 100644 --- a/lib/trap-caching.test.js.map +++ b/lib/trap-caching.test.js.map @@ -1 +1 @@ -{"version":3,"file":"trap-caching.test.js","sourceRoot":"","sources":["../src/trap-caching.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"trap-caching.test.js","sourceRoot":"","sources":["../src/trap-caching.test.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/trap-caching.test.ts b/src/trap-caching.test.ts index a74da96df..fa098ca58 100644 --- a/src/trap-caching.test.ts +++ b/src/trap-caching.test.ts @@ -197,47 +197,56 @@ test("download cache looks for the right key and creates dir", async (t) => { test("cleanup removes only old CodeQL TRAP caches", async (t) => { await util.withTmpDir(async (tmpDir) => { + // This config specifies that we are analyzing JavaScript and Ruby, but not Swift. const config = getTestConfigWithTempDir(tmpDir); sinon.stub(actionsUtil, "getRef").resolves("refs/heads/main"); sinon.stub(actionsUtil, "isAnalyzingDefaultBranch").resolves(true); const listStub = sinon.stub(apiClient, "listActionsCaches").resolves([ + // Should be kept, since it's not relevant to CodeQL. In reality, the API shouldn't return + // this in the first place, but this is a defensive check. { id: 1, key: "some-other-key", created_at: "2024-05-23T14:25:00Z", size_in_bytes: 100 * 1024 * 1024, }, + // Should be kept, since it's the newest TRAP cache for JavaScript { id: 2, key: "codeql-trap-1-2.0.0-javascript-newest", created_at: "2024-04-23T14:25:00Z", size_in_bytes: 50 * 1024 * 1024, }, + // Should be cleaned up { id: 3, key: "codeql-trap-1-2.0.0-javascript-older", created_at: "2024-03-22T14:25:00Z", size_in_bytes: 200 * 1024 * 1024, }, + // Should be cleaned up { id: 4, key: "codeql-trap-1-2.0.0-javascript-oldest", created_at: "2024-02-21T14:25:00Z", size_in_bytes: 300 * 1024 * 1024, }, + // Should be kept, since it's the newest TRAP cache for Ruby { id: 5, key: "codeql-trap-1-2.0.0-ruby-newest", created_at: "2024-02-20T14:25:00Z", size_in_bytes: 300 * 1024 * 1024, }, + // Should be kept, since we aren't analyzing Swift { id: 6, key: "codeql-trap-1-2.0.0-swift-newest", created_at: "2024-02-22T14:25:00Z", size_in_bytes: 300 * 1024 * 1024, }, + // Should be kept, since we aren't analyzing Swift { id: 7, key: "codeql-trap-1-2.0.0-swift-older",