mirror of
https://git.mirrors.martin98.com/https://github.com/actions/toolkit
synced 2026-01-03 06:32:56 +08:00
Fix cache lookup scenario
This commit is contained in:
parent
4dadd612d6
commit
de236da416
22
packages/cache/__tests__/restoreCacheV2.test.ts
vendored
22
packages/cache/__tests__/restoreCacheV2.test.ts
vendored
@ -4,10 +4,10 @@ import * as tar from '../src/internal/tar'
|
||||
import * as config from '../src/internal/config'
|
||||
import * as cacheUtils from '../src/internal/cacheUtils'
|
||||
import * as downloadCacheModule from '../src/internal/blob/download-cache'
|
||||
import { restoreCache } from '../src/cache'
|
||||
import { CacheFilename, CompressionMethod } from '../src/internal/constants'
|
||||
import { CacheServiceClientJSON } from '../src/generated/results/api/v1/cache.twirp'
|
||||
import { BlobDownloadResponseParsed } from '@azure/storage-blob'
|
||||
import {restoreCache} from '../src/cache'
|
||||
import {CacheFilename, CompressionMethod} from '../src/internal/constants'
|
||||
import {CacheServiceClientJSON} from '../src/generated/results/api/v1/cache.twirp'
|
||||
import {BlobDownloadResponseParsed} from '@azure/storage-blob'
|
||||
// import {executePromisesSequentially} from '@azure/ms-rest-js'
|
||||
|
||||
jest.mock('../src/internal/cacheHttpClient')
|
||||
@ -19,11 +19,11 @@ let logDebugMock: jest.SpyInstance
|
||||
let logInfoMock: jest.SpyInstance
|
||||
|
||||
beforeAll(() => {
|
||||
jest.spyOn(console, 'log').mockImplementation(() => { })
|
||||
jest.spyOn(core, 'debug').mockImplementation(() => { })
|
||||
jest.spyOn(core, 'info').mockImplementation(() => { })
|
||||
jest.spyOn(core, 'warning').mockImplementation(() => { })
|
||||
jest.spyOn(core, 'error').mockImplementation(() => { })
|
||||
jest.spyOn(console, 'log').mockImplementation(() => {})
|
||||
jest.spyOn(core, 'debug').mockImplementation(() => {})
|
||||
jest.spyOn(core, 'info').mockImplementation(() => {})
|
||||
jest.spyOn(core, 'warning').mockImplementation(() => {})
|
||||
jest.spyOn(core, 'error').mockImplementation(() => {})
|
||||
|
||||
jest.spyOn(cacheUtils, 'getCacheFileName').mockImplementation(cm => {
|
||||
const actualUtils = jest.requireActual('../src/internal/cacheUtils')
|
||||
@ -357,7 +357,7 @@ test('restore with cache found for restore key', async () => {
|
||||
)
|
||||
expect(getCacheDownloadURLMock).toHaveBeenCalledWith({
|
||||
key,
|
||||
restoreKeys: restoreKeys,
|
||||
restoreKeys,
|
||||
version: cacheVersion
|
||||
})
|
||||
expect(createTempDirectoryMock).toHaveBeenCalledTimes(1)
|
||||
@ -380,7 +380,7 @@ test('restore with cache found for restore key', async () => {
|
||||
test('restore with dry run', async () => {
|
||||
const paths = ['node_modules']
|
||||
const key = 'node-test'
|
||||
const options = { lookupOnly: true }
|
||||
const options = {lookupOnly: true}
|
||||
const compressionMethod = CompressionMethod.Gzip
|
||||
const signedDownloadUrl = 'https://blob-storage.local?signed=true'
|
||||
const cacheVersion =
|
||||
|
||||
2
packages/cache/src/cache.ts
vendored
2
packages/cache/src/cache.ts
vendored
@ -261,7 +261,7 @@ async function restoreCacheV2(
|
||||
|
||||
if (options?.lookupOnly) {
|
||||
core.info('Lookup only - skipping download')
|
||||
return request.key
|
||||
return response.matchedKey
|
||||
}
|
||||
|
||||
archivePath = path.join(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user