Skip to content

Commit aa8033d

Browse files
crazy-maxcrazy-max
committed
jest: fix temp dir
Signed-off-by: CrazyMax <[email protected]>
1 parent a8cf500 commit aa8033d

File tree

14 files changed

+59
-73
lines changed

14 files changed

+59
-73
lines changed

‎__tests__/buildkit/config.test.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,20 @@
1515
*/
1616

1717
import {describe, expect, jest, test, afterEach} from '@jest/globals';
18-
import * as fs from 'fs';
19-
import * as path from 'path';
18+
import fs from 'fs';
19+
import os from 'os';
20+
import path from 'path';
2021
import * as rimraf from 'rimraf';
2122

2223
import {BuildKit} from '../../src/buildkit/buildkit';
2324
import {Context} from '../../src/context';
2425

2526
const fixturesDir = path.join(__dirname, '..', 'fixtures');
26-
// prettier-ignore
27-
const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildkit-config-jest');
27+
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildkit-config-'));
2828
const tmpName = path.join(tmpDir, '.tmpname-jest');
2929

3030
jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
31-
if (!fs.existsSync(tmpDir)) {
32-
fs.mkdirSync(tmpDir, {recursive: true});
33-
}
31+
fs.mkdirSync(tmpDir, {recursive: true});
3432
return tmpDir;
3533
});
3634

‎__tests__/buildx/bake.test.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
*/
1616

1717
import {afterEach, describe, expect, it, jest, test} from '@jest/globals';
18-
import * as fs from 'fs';
19-
import * as path from 'path';
18+
import fs from 'fs';
19+
import os from 'os';
20+
import path from 'path';
2021
import * as rimraf from 'rimraf';
2122

2223
import {Bake} from '../../src/buildx/bake';
@@ -27,15 +28,12 @@ import {BakeDefinition} from '../../src/types/buildx/bake';
2728
import {BuildMetadata} from '../../src/types/buildx/build';
2829

2930
const fixturesDir = path.join(__dirname, '..', 'fixtures');
30-
// prettier-ignore
31-
const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-bake-jest');
31+
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-bake-'));
3232
const tmpName = path.join(tmpDir, '.tmpname-jest');
3333
const metadata = JSON.parse(fs.readFileSync(path.join(fixturesDir, 'metadata-bake.json'), 'utf-8'));
3434

3535
jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
36-
if (!fs.existsSync(tmpDir)) {
37-
fs.mkdirSync(tmpDir, {recursive: true});
38-
}
36+
fs.mkdirSync(tmpDir, {recursive: true});
3937
return tmpDir;
4038
});
4139

‎__tests__/buildx/build.test.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,21 @@
1515
*/
1616

1717
import {afterEach, beforeEach, describe, expect, it, jest, test} from '@jest/globals';
18-
import * as fs from 'fs';
19-
import * as path from 'path';
18+
import fs from 'fs';
19+
import os from 'os';
20+
import path from 'path';
2021
import * as rimraf from 'rimraf';
2122

2223
import {Context} from '../../src/context';
2324
import {Build} from '../../src/buildx/build';
2425

2526
const fixturesDir = path.join(__dirname, '..', 'fixtures');
26-
// prettier-ignore
27-
const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-build-jest');
27+
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-build-'));
2828
const tmpName = path.join(tmpDir, '.tmpname-jest');
2929
const metadata = JSON.parse(fs.readFileSync(path.join(fixturesDir, 'metadata-build.json'), 'utf-8'));
3030

3131
jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
32-
if (!fs.existsSync(tmpDir)) {
33-
fs.mkdirSync(tmpDir, {recursive: true});
34-
}
32+
fs.mkdirSync(tmpDir, {recursive: true});
3533
return tmpDir;
3634
});
3735

‎__tests__/buildx/buildx.test.itg.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
*/
1616

1717
import {describe, expect, it} from '@jest/globals';
18-
import * as fs from 'fs';
19-
import * as path from 'path';
18+
import fs from 'fs';
19+
import os from 'os';
20+
import path from 'path';
2021
import * as core from '@actions/core';
2122

2223
import {Buildx} from '../../src/buildx/buildx';
@@ -25,9 +26,7 @@ import {Bake} from '../../src/buildx/bake';
2526
import {Exec} from '../../src/exec';
2627

2728
const fixturesDir = path.join(__dirname, '..', 'fixtures');
28-
29-
// prettier-ignore
30-
const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-jest');
29+
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-buildx-itg-'));
3130

3231
const maybe = !process.env.GITHUB_ACTIONS || (process.env.GITHUB_ACTIONS === 'true' && process.env.ImageOS && process.env.ImageOS.startsWith('ubuntu')) ? describe : describe.skip;
3332

‎__tests__/buildx/buildx.test.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
*/
1616

1717
import {describe, expect, it, jest, test, beforeEach, afterEach} from '@jest/globals';
18-
import * as fs from 'fs';
19-
import * as path from 'path';
18+
import fs from 'fs';
19+
import os from 'os';
20+
import path from 'path';
2021
import * as rimraf from 'rimraf';
2122
import * as semver from 'semver';
2223

@@ -27,14 +28,11 @@ import {Exec} from '../../src/exec';
2728
import {Cert, LocalState} from '../../src/types/buildx/buildx';
2829

2930
const fixturesDir = path.join(__dirname, '..', 'fixtures');
30-
// prettier-ignore
31-
const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-jest');
31+
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-buildx-'));
3232
const tmpName = path.join(tmpDir, '.tmpname-jest');
3333

3434
jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
35-
if (!fs.existsSync(tmpDir)) {
36-
fs.mkdirSync(tmpDir, {recursive: true});
37-
}
35+
fs.mkdirSync(tmpDir, {recursive: true});
3836
return tmpDir;
3937
});
4038

‎__tests__/buildx/history.test.itg.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
*/
1616

1717
import {afterEach, beforeEach, describe, expect, it, jest, test} from '@jest/globals';
18-
import * as fs from 'fs';
19-
import * as path from 'path';
18+
import fs from 'fs';
19+
import os from 'os';
20+
import path from 'path';
2021

2122
import {Buildx} from '../../src/buildx/buildx';
2223
import {Bake} from '../../src/buildx/bake';
@@ -25,9 +26,7 @@ import {History} from '../../src/buildx/history';
2526
import {Exec} from '../../src/exec';
2627

2728
const fixturesDir = path.join(__dirname, '..', 'fixtures');
28-
29-
// prettier-ignore
30-
const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-history-jest');
29+
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-history-itg-'));
3130

3231
const maybe = !process.env.GITHUB_ACTIONS || (process.env.GITHUB_ACTIONS === 'true' && process.env.ImageOS && process.env.ImageOS.startsWith('ubuntu')) ? describe : describe.skip;
3332

‎__tests__/buildx/install.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
*/
1616

1717
import {describe, expect, it, jest, test, afterEach} from '@jest/globals';
18-
import * as fs from 'fs';
19-
import * as path from 'path';
18+
import fs from 'fs';
19+
import os from 'os';
20+
import path from 'path';
2021
import * as rimraf from 'rimraf';
2122
import osm = require('os');
2223

2324
import {Install} from '../../src/buildx/install';
2425

25-
// prettier-ignore
26-
const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-jest');
26+
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-install-'));
2727

2828
afterEach(function () {
2929
rimraf.sync(tmpDir);

‎__tests__/cache.test.itg.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
import path from 'path';
1817
import {describe, expect, it} from '@jest/globals';
18+
import fs from 'fs';
19+
import os from 'os';
20+
import path from 'path';
1921

2022
import {Cache} from '../src/cache';
2123

22-
// prettier-ignore
23-
const tmpDir = path.join(process.env.TEMP || '/tmp', 'cache-jest');
24-
2524
const fixturesDir = path.join(__dirname, 'fixtures');
25+
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'cache-itg-'));
2626

2727
describe('cache', () => {
2828
it('github-repo', async () => {

‎__tests__/context.test.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,19 @@
1414
* limitations under the License.
1515
*/
1616

17-
import * as fs from 'fs';
18-
import * as path from 'path';
19-
import * as rimraf from 'rimraf';
2017
import {describe, expect, jest, it, afterEach} from '@jest/globals';
18+
import fs from 'fs';
19+
import os from 'os';
20+
import path from 'path';
21+
import * as rimraf from 'rimraf';
2122

2223
import {Context} from '../src/context';
2324

24-
// prettier-ignore
25-
const tmpDir = path.join(process.env.TEMP || '/tmp', 'context-jest');
25+
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'context-'));
2626
const tmpName = path.join(tmpDir, '.tmpname-jest');
2727

2828
jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
29-
if (!fs.existsSync(tmpDir)) {
30-
fs.mkdirSync(tmpDir, {recursive: true});
31-
}
29+
fs.mkdirSync(tmpDir, {recursive: true});
3230
return tmpDir;
3331
});
3432

‎__tests__/docker/docker.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
*/
1616

1717
import {afterEach, beforeEach, describe, expect, it, jest} from '@jest/globals';
18-
import * as fs from 'fs';
18+
import fs from 'fs';
19+
import os from 'os';
1920
import path from 'path';
2021
import * as io from '@actions/io';
2122
import osm = require('os');
@@ -26,9 +27,7 @@ import {Docker} from '../../src/docker/docker';
2627
import {ConfigFile} from '../../src/types/docker/docker';
2728

2829
const fixturesDir = path.join(__dirname, '..', 'fixtures');
29-
30-
// prettier-ignore
31-
const tmpDir = path.join(process.env.TEMP || '/tmp', 'docker-jest');
30+
const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'docker-docker-'));
3231

3332
afterEach(function () {
3433
rimraf.sync(tmpDir);

0 commit comments

Comments
 (0)