ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add some package management unit tests for JupyterServerInstallation (#11777)

Browse Source
This commit is contained in:
Cory Rivera
2020-08-13 13:12:28 -07:00
committed by GitHub
parent c66726cdb5
commit d68433ec22
3 changed files with 214 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
extensions/notebook/src/jupyter/jupyterServerInstallation.ts
View File

@@ -670,11 +670,14 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
let cmd = `"${pythonExePath ?? this.pythonExecutable}" -m pip list --format=json`;
let packagesInfo = await this.executeBufferedCommand(cmd);
let packagesResult: PythonPkgDetails[] = [];
let packages: PythonPkgDetails[] = [];
if (packagesInfo) {
packagesResult = <PythonPkgDetails[]>JSON.parse(packagesInfo);
let parsedResult = <PythonPkgDetails[]>JSON.parse(packagesInfo);
if (parsedResult) {
packages = parsedResult;
}
}
return packagesResult;
return packages;
}
catch (err) {
this.outputChannel.appendLine(msgPackageRetrievalFailed(utils.getErrorMessage(err)));
@@ -716,15 +719,14 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
let cmd = `"${condaExe}" list --json`;
let packagesInfo = await this.executeBufferedCommand(cmd);
let packages: PythonPkgDetails[] = [];
if (packagesInfo) {
let packagesResult = JSON.parse(packagesInfo);
if (Array.isArray(packagesResult)) {
return packagesResult
.filter(pkg => pkg && pkg.channel && pkg.channel !== 'pypi')
.map(pkg => <PythonPkgDetails>{ name: pkg.name, version: pkg.version });
let parsedResult = <PythonPkgDetails[]>JSON.parse(packagesInfo);
if (parsedResult) {
packages = parsedResult.filter(pkg => pkg && pkg.channel && pkg.channel !== 'pypi');
}
}
return [];
return packages;
}
catch (err) {
this.outputChannel.appendLine(msgPackageRetrievalFailed(utils.getErrorMessage(err)));
@@ -787,10 +789,6 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
}
private isCondaInstalled(): boolean {
if (!this._usingExistingPython) {
return false;
}
let condaExePath = this.getCondaExePath();
// eslint-disable-next-line no-sync
return fs.existsSync(condaExePath);
@@ -886,6 +884,7 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
export interface PythonPkgDetails {
name: string;
version: string;
channel?: string;
}
export interface PipPackageOverview {