Skip to content

Fix race in proxy-bcrypt test that crashes Windows CI #1008

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

Open
X-Guardian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix race in proxy-bcrypt test that crashes Windows CI #1008

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 9 additions & 18 deletions test/proxy-bcrypt.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ test('setup proxy server', (t) => {

// make sure the download directory deleted then create an empty one
rimraf(downloadDir).then(() => {
fs.mkdir('download', (e) => {
fs.mkdir(downloadDir, (e) => {
if (e && e.code !== 'EEXIST') {
t.error(e);
return;
Expand Down Expand Up @@ -88,18 +88,14 @@ test('verify node fetch with a proxy successfully downloads bcrypt pre-built', (
getBcrypt()
.then((stream) => {
const unzip = createUnzip();
stream
.pipe(unzip);
const extract = tar.extract(downloadDir, tarOptions);
stream.pipe(unzip).pipe(extract);

unzip
.pipe(tar.extract(`${downloadDir}`, tarOptions));

return unzip;
})
.then((stream) => {
// wait for tar-fs to finish (it sets file times after writing), not just for gunzip to end
return new Promise((resolve, reject) => {
stream.on('end', resolve);
stream.on('error', reject);
unzip.on('error', reject);
extract.on('error', reject);
extract.on('finish', resolve);
});
})
// if no errors on download and the file is there that's good enough. napi version
Expand All @@ -117,15 +113,10 @@ test('verify node fetch with a proxy successfully downloads bcrypt pre-built', (
});

// this is really just onFinish() but local to the tests in this file
test(`cleanup after ${__filename}`, (t) => {
test(`cleanup after ${__filename}`, async () => {
proxy.stopServer();
delete process.env.NOCK_OFF;
delete process.env.http_proxy;
delete process.env.https_proxy;
try {
rimraf(downloadDir);
} catch (err) {
// ignore errors
}
t.end();
await rimraf(downloadDir).catch(() => {});
});