Fix uninstall specs: helm not uninstallable
This commit is contained in:
parent
024ddcab17
commit
3cac5b05b2
|
@ -5,7 +5,7 @@ require 'spec_helper'
|
|||
describe Clusters::Applications::CheckUninstallProgressService do
|
||||
RESCHEDULE_PHASES = Gitlab::Kubernetes::Pod::PHASES - [Gitlab::Kubernetes::Pod::SUCCEEDED, Gitlab::Kubernetes::Pod::FAILED].freeze
|
||||
|
||||
let(:application) { create(:clusters_applications_helm, :uninstalling) }
|
||||
let(:application) { create(:clusters_applications_prometheus, :uninstalling) }
|
||||
let(:service) { described_class.new(application) }
|
||||
let(:phase) { Gitlab::Kubernetes::Pod::UNKNOWN }
|
||||
let(:errors) { nil }
|
||||
|
@ -95,12 +95,12 @@ describe Clusters::Applications::CheckUninstallProgressService do
|
|||
service.execute
|
||||
|
||||
expect(application).to be_uninstall_errored
|
||||
expect(application.status_reason).to eq('Operation failed. Check pod logs for uninstall-helm for more details.')
|
||||
expect(application.status_reason).to eq('Operation failed. Check pod logs for uninstall-prometheus for more details.')
|
||||
end
|
||||
end
|
||||
|
||||
context 'when timed out' do
|
||||
let(:application) { create(:clusters_applications_helm, :timeouted, :uninstalling) }
|
||||
let(:application) { create(:clusters_applications_prometheus, :timeouted, :uninstalling) }
|
||||
|
||||
before do
|
||||
expect(service).to receive(:installation_phase).once.and_return(phase)
|
||||
|
@ -112,7 +112,7 @@ describe Clusters::Applications::CheckUninstallProgressService do
|
|||
service.execute
|
||||
|
||||
expect(application).to be_uninstall_errored
|
||||
expect(application.status_reason).to eq('Operation timed out. Check pod logs for uninstall-helm for more details.')
|
||||
expect(application.status_reason).to eq('Operation timed out. Check pod logs for uninstall-prometheus for more details.')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Clusters::Applications::UninstallService, '#execute' do
|
||||
let(:application) { create(:clusters_applications_helm, :scheduled) }
|
||||
let(:application) { create(:clusters_applications_prometheus, :scheduled) }
|
||||
let(:service) { described_class.new(application) }
|
||||
let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm::Api) }
|
||||
let(:worker_class) { Clusters::Applications::WaitForUninstallAppWorker }
|
||||
|
@ -14,7 +14,7 @@ describe Clusters::Applications::UninstallService, '#execute' do
|
|||
|
||||
context 'when there are no errors' do
|
||||
before do
|
||||
expect(helm_client).to receive(:uninstall).with(kind_of(Gitlab::Kubernetes::Helm::ResetCommand))
|
||||
expect(helm_client).to receive(:uninstall).with(kind_of(Gitlab::Kubernetes::Helm::DeleteCommand))
|
||||
allow(worker_class).to receive(:perform_in).and_return(nil)
|
||||
end
|
||||
|
||||
|
@ -36,7 +36,7 @@ describe Clusters::Applications::UninstallService, '#execute' do
|
|||
let(:error) { Kubeclient::HttpError.new(500, 'system failure', nil) }
|
||||
|
||||
before do
|
||||
expect(helm_client).to receive(:uninstall).with(kind_of(Gitlab::Kubernetes::Helm::ResetCommand)).and_raise(error)
|
||||
expect(helm_client).to receive(:uninstall).with(kind_of(Gitlab::Kubernetes::Helm::DeleteCommand)).and_raise(error)
|
||||
end
|
||||
|
||||
include_examples 'logs kubernetes errors' do
|
||||
|
@ -54,11 +54,11 @@ describe Clusters::Applications::UninstallService, '#execute' do
|
|||
end
|
||||
|
||||
context 'a non kubernetes error happens' do
|
||||
let(:application) { create(:clusters_applications_helm, :scheduled) }
|
||||
let(:application) { create(:clusters_applications_prometheus, :scheduled) }
|
||||
let(:error) { StandardError.new('something bad happened') }
|
||||
|
||||
before do
|
||||
expect(helm_client).to receive(:uninstall).with(kind_of(Gitlab::Kubernetes::Helm::ResetCommand)).and_raise(error)
|
||||
expect(helm_client).to receive(:uninstall).with(kind_of(Gitlab::Kubernetes::Helm::DeleteCommand)).and_raise(error)
|
||||
end
|
||||
|
||||
include_examples 'logs kubernetes errors' do
|
||||
|
|
Loading…
Reference in New Issue