Skip to content

Commit

Permalink
Merge pull request #3260 from mzazrivec/remove_failing_middleware_tes…
Browse files Browse the repository at this point in the history
…ts_2

Remove failing middleware tests
(cherry picked from commit 43ed1d6)
  • Loading branch information
himdel authored and simaishi committed Jan 17, 2018
1 parent 7f4973c commit 3ede7b5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 88 deletions.
34 changes: 0 additions & 34 deletions spec/controllers/middleware_domain_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,38 +40,4 @@
end
end
end

describe 'domain operations:' do
let(:ems) { FactoryGirl.create(:ems_hawkular) }
let(:mw_domain) do
FactoryGirl.create(
:hawkular_middleware_domain,
:ext_management_system => ems,
:ems_ref => '/t;hawkular/f;master.Unnamed%20Domain/r;Local~~/r;Local~%2Fhost%3Dmaster'
)
end

before(:each) do
MiqServer.seed
end

it 'stop operation should create timeline event' do
allow(controller).to receive(:trigger_mw_operation)

post :button, :params => {
:id => mw_domain.id,
:pressed => :middleware_domain_stop
}

# Simulate queue delivery, and test that the event has been placed in the timeline
MiqQueue.last.deliver
event = EmsEvent.last
expect(event.ems_id).to eq(ems.id)
expect(event.source).to eq('EVM')
expect(event.event_type).to eq('MwDomain.Stop.UserRequest')
expect(event.middleware_domain_id).to eq(mw_domain.id)
expect(event.middleware_domain_name).to eq(mw_domain.name)
expect(event.username).to eq(user.userid)
end
end
end
54 changes: 0 additions & 54 deletions spec/controllers/middleware_server_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -159,60 +159,6 @@
end
end

describe('Standalone server operations:') do
def timeline_event_expectations(event, operation_info, mw_server)
expect(event.ems_id).to eq(ems.id)
expect(event.source).to eq('EVM')
expect(event.event_type).to eq(operation_info.fetch(:log_timeline))
expect(event.message).to eq(_('%{server} will be %{operation} per user request') %
{:operation => operation_info.fetch(:hawk), :server => mw_server.name})
expect(event.middleware_server_id).to eq(mw_server.id)
expect(event.middleware_server_name).to eq(mw_server.name)
expect(event.username).to eq(user.userid)
end

let(:ems) { FactoryGirl.create(:ems_middleware) }
let(:mw_server) do
FactoryGirl.create(:hawkular_middleware_server,
:ext_management_system => ems,
:ems_ref => '/f;f1/r;server')
end

before(:each) do
EvmSpecHelper.create_guid_miq_server_zone
allow(controller).to receive(:trigger_mw_operation)
end

%w(reload suspend resume stop shutdown restart).each do |operation|
it("#{operation} button operation should create timeline event") do
op_name = "middleware_server_#{operation}"
operation_info = described_class::ALL_OPERATIONS.fetch(op_name.to_sym)

post :button, :params => {
:id => mw_server.id,
:pressed => op_name,
:timeout => 10
}

MiqQueue.last.deliver
timeline_event_expectations(EmsEvent.last, operation_info, mw_server)
end

it("#{operation} dialog operation should create timeline event") do
operation_info = described_class::ALL_OPERATIONS.fetch("middleware_server_#{operation}".to_sym)

post :run_operation, :params => {
:id => mw_server.id,
:operation => operation,
:timeout => 10
}

MiqQueue.last.deliver
timeline_event_expectations(EmsEvent.last, operation_info, mw_server)
end
end
end

describe '#report_data' do
context 'list of middleware servers' do
let!(:server) { FactoryGirl.create(:middleware_server) }
Expand Down

0 comments on commit 3ede7b5

Please sign in to comment.