@@ -29,7 +29,7 @@ chaiUse(chaiAsPromised);
2929suite ( 'Conda Creation provider tests' , ( ) => {
3030 let condaProvider : CreateEnvironmentProvider ;
3131 let progressMock : typemoq . IMock < CreateEnvironmentProgress > ;
32- let getCondaStub : sinon . SinonStub ;
32+ let getCondaBaseEnvStub : sinon . SinonStub ;
3333 let pickPythonVersionStub : sinon . SinonStub ;
3434 let pickWorkspaceFolderStub : sinon . SinonStub ;
3535 let execObservableStub : sinon . SinonStub ;
@@ -38,7 +38,7 @@ suite('Conda Creation provider tests', () => {
3838
3939 setup ( ( ) => {
4040 pickWorkspaceFolderStub = sinon . stub ( wsSelect , 'pickWorkspaceFolder' ) ;
41- getCondaStub = sinon . stub ( condaUtils , 'getConda ' ) ;
41+ getCondaBaseEnvStub = sinon . stub ( condaUtils , 'getCondaBaseEnv ' ) ;
4242 pickPythonVersionStub = sinon . stub ( condaUtils , 'pickPythonVersion' ) ;
4343 execObservableStub = sinon . stub ( rawProcessApis , 'execObservable' ) ;
4444 withProgressStub = sinon . stub ( windowApis , 'withProgress' ) ;
@@ -55,20 +55,20 @@ suite('Conda Creation provider tests', () => {
5555 } ) ;
5656
5757 test ( 'No conda installed' , async ( ) => {
58- getCondaStub . resolves ( undefined ) ;
58+ getCondaBaseEnvStub . resolves ( undefined ) ;
5959
6060 assert . isUndefined ( await condaProvider . createEnvironment ( ) ) ;
6161 } ) ;
6262
6363 test ( 'No workspace selected' , async ( ) => {
64- getCondaStub . resolves ( '/usr/bin/conda' ) ;
64+ getCondaBaseEnvStub . resolves ( '/usr/bin/conda' ) ;
6565 pickWorkspaceFolderStub . resolves ( undefined ) ;
6666
6767 assert . isUndefined ( await condaProvider . createEnvironment ( ) ) ;
6868 } ) ;
6969
7070 test ( 'No python version picked selected' , async ( ) => {
71- getCondaStub . resolves ( '/usr/bin/conda' ) ;
71+ getCondaBaseEnvStub . resolves ( '/usr/bin/conda' ) ;
7272 pickWorkspaceFolderStub . resolves ( {
7373 uri : Uri . file ( path . join ( EXTENSION_ROOT_DIR_FOR_TESTS , 'src' , 'testMultiRootWkspc' , 'workspace1' ) ) ,
7474 name : 'workspace1' ,
@@ -80,7 +80,7 @@ suite('Conda Creation provider tests', () => {
8080 } ) ;
8181
8282 test ( 'Create conda environment' , async ( ) => {
83- getCondaStub . resolves ( '/usr/bin/conda/conda_bin /conda' ) ;
83+ getCondaBaseEnvStub . resolves ( '/usr/bin/conda' ) ;
8484 const workspace1 = {
8585 uri : Uri . file ( path . join ( EXTENSION_ROOT_DIR_FOR_TESTS , 'src' , 'testMultiRootWkspc' , 'workspace1' ) ) ,
8686 name : 'workspace1' ,
@@ -95,7 +95,9 @@ suite('Conda Creation provider tests', () => {
9595 execObservableStub . callsFake ( ( ) => {
9696 deferred . resolve ( ) ;
9797 return {
98- proc : undefined ,
98+ proc : {
99+ exitCode : 0 ,
100+ } ,
99101 out : {
100102 subscribe : (
101103 next ?: ( value : Output < string > ) => void ,
@@ -134,7 +136,7 @@ suite('Conda Creation provider tests', () => {
134136 } ) ;
135137
136138 test ( 'Create conda environment failed' , async ( ) => {
137- getCondaStub . resolves ( '/usr/bin/conda/conda_bin /conda' ) ;
139+ getCondaBaseEnvStub . resolves ( '/usr/bin/conda' ) ;
138140 pickWorkspaceFolderStub . resolves ( {
139141 uri : Uri . file ( path . join ( EXTENSION_ROOT_DIR_FOR_TESTS , 'src' , 'testMultiRootWkspc' , 'workspace1' ) ) ,
140142 name : 'workspace1' ,
@@ -183,4 +185,60 @@ suite('Conda Creation provider tests', () => {
183185 await assert . isRejected ( promise ) ;
184186 assert . isTrue ( showErrorMessageWithLogsStub . calledOnce ) ;
185187 } ) ;
188+
189+ test ( 'Create conda environment failed (non-zero exit code)' , async ( ) => {
190+ getCondaBaseEnvStub . resolves ( '/usr/bin/conda' ) ;
191+ const workspace1 = {
192+ uri : Uri . file ( path . join ( EXTENSION_ROOT_DIR_FOR_TESTS , 'src' , 'testMultiRootWkspc' , 'workspace1' ) ) ,
193+ name : 'workspace1' ,
194+ index : 0 ,
195+ } ;
196+ pickWorkspaceFolderStub . resolves ( workspace1 ) ;
197+ pickPythonVersionStub . resolves ( '3.10' ) ;
198+
199+ const deferred = createDeferred ( ) ;
200+ let _next : undefined | ( ( value : Output < string > ) => void ) ;
201+ let _complete : undefined | ( ( ) => void ) ;
202+ execObservableStub . callsFake ( ( ) => {
203+ deferred . resolve ( ) ;
204+ return {
205+ proc : {
206+ exitCode : 1 ,
207+ } ,
208+ out : {
209+ subscribe : (
210+ next ?: ( value : Output < string > ) => void ,
211+ _error ?: ( error : unknown ) => void ,
212+ complete ?: ( ) => void ,
213+ ) => {
214+ _next = next ;
215+ _complete = complete ;
216+ } ,
217+ } ,
218+ dispose : ( ) => undefined ,
219+ } ;
220+ } ) ;
221+
222+ progressMock . setup ( ( p ) => p . report ( { message : CreateEnv . statusStarting } ) ) . verifiable ( typemoq . Times . once ( ) ) ;
223+
224+ withProgressStub . callsFake (
225+ (
226+ _options : ProgressOptions ,
227+ task : (
228+ progress : CreateEnvironmentProgress ,
229+ token ?: CancellationToken ,
230+ ) => Thenable < CreateEnvironmentResult > ,
231+ ) => task ( progressMock . object ) ,
232+ ) ;
233+
234+ const promise = condaProvider . createEnvironment ( ) ;
235+ await deferred . promise ;
236+ assert . isDefined ( _next ) ;
237+ assert . isDefined ( _complete ) ;
238+
239+ _next ! ( { out : `${ CONDA_ENV_CREATED_MARKER } new_environment` , source : 'stdout' } ) ;
240+ _complete ! ( ) ;
241+ await assert . isRejected ( promise ) ;
242+ assert . isTrue ( showErrorMessageWithLogsStub . calledOnce ) ;
243+ } ) ;
186244} ) ;
0 commit comments