Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove use of experimental fs.promises api #53346

Merged
merged 7 commits into from
Dec 25, 2019
Merged

remove use of experimental fs.promises api #53346

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
18722e7
remove use of experimental fs.promises api
spalger Dec 17, 2019
39fb554
Merge branch 'master' into remove/fs.promises-usage
elasticmachine Dec 18, 2019
530c7f3
Merge branch 'master' into remove/fs.promises-usage
elasticmachine Dec 20, 2019
7ea2091
Merge branch 'master' of github.com:elastic/kibana into remove/fs.pro…
spalger Dec 22, 2019
522227b
remove one more usage of fs.promises
spalger Dec 22, 2019
f8b611b
Merge branch 'master' of github.com:elastic/kibana into remove/fs.pro…
spalger Dec 23, 2019
84801a6
switch to an alternate fs module to maintain testing strategy
spalger Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/core/server/uuid/resolve_uuid.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
* under the License.
*/

import { promises } from 'fs';
import Fs from 'fs';
import { join } from 'path';
import { resolveInstanceUuid } from './resolve_uuid';
import { configServiceMock } from '../config/config_service.mock';
import { loggingServiceMock } from '../logging/logging_service.mock';
import { BehaviorSubject } from 'rxjs';
import { Logger } from '../logging';

const { readFile, writeFile } = promises;
const { readFile, writeFile } = Fs;

jest.mock('uuid', () => ({
v4: () => 'NEW_UUID',
Expand All @@ -35,11 +35,8 @@ jest.mock('fs', () => {
const actual = jest.requireActual('fs');
return {
...actual,
promises: {
...actual.promises,
readFile: jest.fn(() => Promise.resolve('')),
writeFile: jest.fn(() => Promise.resolve('')),
},
readFile: jest.fn().mockImplementation((...args) => process.nextTick(args.pop())),
writeFile: jest.fn().mockImplementation((...args) => process.nextTick(args.pop())),
};
});

Expand Down
6 changes: 4 additions & 2 deletions src/core/server/uuid/resolve_uuid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@
*/

import uuid from 'uuid';
import { promises } from 'fs';
import Fs from 'fs';
import { promisify } from 'util';
import { join } from 'path';
import { take } from 'rxjs/operators';
import { IConfigService } from '../config';
import { PathConfigType, config as pathConfigDef } from '../path';
import { HttpConfigType, config as httpConfigDef } from '../http';
import { Logger } from '../logging';

const { readFile, writeFile } = promises;
const readFile = promisify(Fs.readFile);
const writeFile = promisify(Fs.writeFile);

const FILE_ENCODING = 'utf8';
const FILE_NAME = 'uuid';
Expand Down
6 changes: 3 additions & 3 deletions utilities/visual_regression.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ async function compareScreenshots() {

const diffImagePath = path.resolve(DIFF_SCREENSHOTS_DIR, screenshot);

const sessionImage = PNG.sync.read(await fs.promises.readFile(sessionImagePath));
const baselineImage = PNG.sync.read(await fs.promises.readFile(baselineImagePath));
const sessionImage = PNG.sync.read(await readFileAsync(sessionImagePath));
const baselineImage = PNG.sync.read(await readFileAsync(baselineImagePath));
const { width, height } = sessionImage;
const diff = new PNG({ width, height });

Expand All @@ -117,7 +117,7 @@ async function compareScreenshots() {
{ threshold: 0 }
);

await fs.promises.writeFile(diffImagePath, PNG.sync.write(diff));
await writeFileAsync(diffImagePath, PNG.sync.write(diff));

const change = numDiffPixels / (width * height);
const changePercentage = (change * 100).toFixed(2);
Expand Down