Skip to content

Commit 4199697

Browse files
committed
Remove 'oc wait' call after Delete Project command exits
Signed-off-by: Denis Golovin <dgolovin@redhat.com>
1 parent c6d7295 commit 4199697

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

src/odo.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@ export class Command {
104104
return `odo project delete ${name} -o json`;
105105
}
106106

107-
static waitForProjectToBeGone(project: string): string {
108-
return `oc wait project/${project} --for delete`;
109-
}
110-
111107
@verbose
112108
static createProject(name: string): string {
113109
return `odo project create ${name}`;
@@ -948,7 +944,6 @@ export class OdoImpl implements Odo {
948944

949945
public async deleteProject(project: OpenShiftObject): Promise<OpenShiftObject> {
950946
await this.execute(Command.deleteProject(project.getName()));
951-
await this.execute(Command.waitForProjectToBeGone(project.getName()), process.cwd(), false);
952947
return this.deleteAndRefresh(project);
953948
}
954949

test/unit/openshift/project.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,13 @@ suite('OpenShift/Project', () => {
144144

145145
expect(result).equals(`Project '${projectItem.getName()}' successfully deleted`);
146146
expect(execStub.getCall(0).args[0]).equals(Command.deleteProject(projectItem.getName()));
147-
expect(execStub.getCall(1).args[0]).equals(Command.waitForProjectToBeGone(projectItem.getName()));
148147
});
149148

150149
test('works without context', async () => {
151150
const result = await Project.del(null);
152151

153152
expect(result).equals(`Project '${projectItem.getName()}' successfully deleted`);
154153
expect(execStub.getCall(0).args[0]).equals(Command.deleteProject(projectItem.getName()));
155-
expect(execStub.getCall(1).args[0]).equals(Command.waitForProjectToBeGone(projectItem.getName()));
156154
});
157155

158156
test('returns null with no project selected', async () => {

test/unit/tools.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ suite("tools configuration", () => {
4949
});
5050

5151
test('returns version undefined for unexpected output', async () => {
52-
const invalidData: CliExitData = { error: undefined, stderr: '', stdout: 'ocunexpected v0.0.13 (65b5bed8) \n line two' };
52+
const invalidData: CliExitData = { error: undefined, stderr: '', stdout: 'ocunexpected v0-0-13 (65b5bed8) \n line two' };
5353
sb.stub(CliChannel.prototype, 'execute').resolves(invalidData);
5454
sb.stub(fs, 'existsSync').returns(true);
5555

@@ -58,7 +58,7 @@ suite("tools configuration", () => {
5858
});
5959

6060
test('returns version undefined for not existing tool', async () => {
61-
const invalidData: CliExitData = { error: undefined, stderr: '', stdout: 'ocunexpected v0.0.13 (65b5bed8) \n line two' };
61+
const invalidData: CliExitData = { error: undefined, stderr: '', stdout: 'ocunexpected v0-0-13 (65b5bed8) \n line two' };
6262
sb.stub(CliChannel.prototype, 'execute').resolves(invalidData);
6363
sb.stub(fs, 'existsSync').returns(false);
6464

@@ -67,7 +67,7 @@ suite("tools configuration", () => {
6767
});
6868

6969
test('returns version undefined for tool that does not support version parameter', async () => {
70-
const invalidData: CliExitData = { error: new Error('something bad happened'), stderr: '', stdout: 'ocunexpected v0.0.13 (65b5bed8) \n line two' };
70+
const invalidData: CliExitData = { error: new Error('something bad happened'), stderr: '', stdout: 'ocunexpected v0-0-13 (65b5bed8) \n line two' };
7171
sb.stub(CliChannel.prototype, 'execute').resolves(invalidData);
7272
sb.stub(fs, 'existsSync').returns(true);
7373

0 commit comments

Comments
 (0)