mirror of
https://github.com/Microsoft/vscode
synced 2024-10-01 08:50:48 +00:00
Module not shared on Windows?
This commit is contained in:
parent
3cdb165262
commit
298c72219b
|
@ -8,7 +8,7 @@ import 'mocha';
|
||||||
import { assertNoRpc } from '../utils';
|
import { assertNoRpc } from '../utils';
|
||||||
import { pki } from 'node-forge';
|
import { pki } from 'node-forge';
|
||||||
import { AddressInfo } from 'net';
|
import { AddressInfo } from 'net';
|
||||||
import { resetCaches, testCertificates } from '@vscode/proxy-agent';
|
import { resetCaches } from '@vscode/proxy-agent';
|
||||||
|
|
||||||
suite('vscode API - network proxy support', () => {
|
suite('vscode API - network proxy support', () => {
|
||||||
|
|
||||||
|
@ -52,8 +52,8 @@ suite('vscode API - network proxy support', () => {
|
||||||
rejectPort(err);
|
rejectPort(err);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Using `testCertificates` shared between proxyResolver.ts and proxy.test.ts.
|
// Using https.globalAgent because it is shared with proxyResolver.ts and mutable.
|
||||||
testCertificates.splice(0, testCertificates.length, certPEM);
|
(https.globalAgent as any).testCertificates = [certPEM];
|
||||||
resetCaches();
|
resetCaches();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -69,7 +69,7 @@ suite('vscode API - network proxy support', () => {
|
||||||
.on('error', reject);
|
.on('error', reject);
|
||||||
});
|
});
|
||||||
} finally {
|
} finally {
|
||||||
testCertificates.splice(0, testCertificates.length);
|
delete (https.globalAgent as any).testCertificates;
|
||||||
resetCaches();
|
resetCaches();
|
||||||
server.close();
|
server.close();
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionS
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { ILogService, LogLevel as LogServiceLevel } from 'vs/platform/log/common/log';
|
import { ILogService, LogLevel as LogServiceLevel } from 'vs/platform/log/common/log';
|
||||||
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
|
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
|
||||||
import { LogLevel, createHttpPatch, createProxyResolver, createTlsPatch, ProxySupportSetting, ProxyAgentParams, createNetPatch, loadSystemCertificates, testCertificates } from '@vscode/proxy-agent';
|
import { LogLevel, createHttpPatch, createProxyResolver, createTlsPatch, ProxySupportSetting, ProxyAgentParams, createNetPatch, loadSystemCertificates } from '@vscode/proxy-agent';
|
||||||
|
|
||||||
const systemCertificatesV2Default = false;
|
const systemCertificatesV2Default = false;
|
||||||
|
|
||||||
|
@ -67,10 +67,10 @@ export function connectProxyResolver(
|
||||||
certs.then(certs => extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loaded certificates from main process', certs.length));
|
certs.then(certs => extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loaded certificates from main process', certs.length));
|
||||||
promises.push(certs);
|
promises.push(certs);
|
||||||
}
|
}
|
||||||
// Using `testCertificates` shared between proxyResolver.ts and proxy.test.ts.
|
// Using https.globalAgent because it is shared with proxy.test.ts and mutable.
|
||||||
if (initData.environment.extensionTestsLocationURI && testCertificates.length) {
|
if (initData.environment.extensionTestsLocationURI && (https.globalAgent as any).testCertificates?.length) {
|
||||||
extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loading test certificates');
|
extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loading test certificates');
|
||||||
promises.push(Promise.resolve(testCertificates));
|
promises.push(Promise.resolve((https.globalAgent as any).testCertificates as string[]));
|
||||||
}
|
}
|
||||||
return (await Promise.all(promises)).flat();
|
return (await Promise.all(promises)).flat();
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue