Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use existing Zone not 'default' for MiqServer.my_zone or in request #4669

Merged
merged 1 commit into from
Sep 17, 2018

Conversation

ZitaNemeckova
Copy link
Contributor

Fixing failures introduced by ManageIQ/manageiq#17987

@miq-bot add_label test

@miq-bot miq-bot added the test label Sep 17, 2018
@miq-bot
Copy link
Member

miq-bot commented Sep 17, 2018

Checked commit ZitaNemeckova@20a81a3 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
6 files checked, 0 offenses detected
Everything looks fine. ⭐

@@ -1,4 +1,7 @@
describe ApplicationController do
let!(:server) { EvmSpecHelper.local_miq_server(:zone => zone) }
let(:zone) { FactoryGirl.create(:zone) }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand. Were we queueing things without a zone before this change?

Copy link
Contributor

@himdel himdel Sep 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The zone didn't exist, we would just use "default" before in the specs.. (without such a zone existing in the db)

@himdel himdel merged commit 248d491 into ManageIQ:master Sep 17, 2018
@himdel himdel self-assigned this Sep 17, 2018
@himdel himdel added this to the Sprint 95 Ending Sep 24, 2018 milestone Sep 17, 2018
@simaishi
Copy link
Contributor

simaishi commented Oct 9, 2018

ManageIQ/manageiq#17987 is gaprindashvili/yes. Please add gaprindashvili/yes if this can be backported to Gaprindashvili as is.

@ZitaNemeckova
Copy link
Contributor Author

@miq-bot add_label gaprindashvili/yes

simaishi pushed a commit that referenced this pull request Oct 10, 2018
Use existing Zone not 'default' for MiqServer.my_zone or in request

(cherry picked from commit 248d491)
@simaishi
Copy link
Contributor

Gaprindashvili backport details:

$ git log -1
commit 52cd01460a218006516c973f5e8715b486f11de2
Author: Martin Hradil <himdel@seznam.cz>
Date:   Mon Sep 17 12:30:46 2018 +0000

    Merge pull request #4669 from ZitaNemeckova/fix_zone_related_failures
    
    Use existing Zone not 'default' for MiqServer.my_zone or in request
    
    (cherry picked from commit 248d49155a3be71abea1d407ba365a68ccccba2d)

@simaishi
Copy link
Contributor

@ZitaNemeckova Travis is still failing in Gaprindashvili branch. Would you mind taking a look?

https://travis-ci.org/ManageIQ/manageiq-ui-classic/jobs/439823454

  1) VmOrTemplateController#vm_button_operation should continue to retire a vm
     Failure/Error:
       expect(assigns(:flash_array).first[:message]).to \
         include("Retirement initiated for 1 VM and Instance from the %{product} Database" % {:product => I18n.t('product.name')})
       expected "Error during 'retire_now': Validation failed: Zone is not included in the list" to include "Retirement initiated for 1 VM and Instance from the ManageIQ Database"
     # ./spec/controllers/application_controller/ci_processing_spec.rb:945:in `block (3 levels) in <top (required)>'
     # ./spec/spec_helper.rb:73:in `block (3 levels) in <top (required)>'
     # ./spec/manageiq/spec/support/evm_spec_helper.rb:35:in `clear_caches'
     # ./spec/spec_helper.rb:73:in `block (2 levels) in <top (required)>'

  2) ServiceController#vm_button_operation should continue to retire a service and does not render flash message 'xxx does not apply xxx' 
     Failure/Error:
       expect(assigns(:flash_array).first[:message]).to \
         include("Retirement initiated for 1 Service from the %{product} Database" % {:product => I18n.t('product.name')})
       expected "Error during 'retire_now': Validation failed: Zone is not included in the list" to include "Retirement initiated for 1 Service from the ManageIQ Database"
     # ./spec/controllers/application_controller/ci_processing_spec.rb:877:in `block (3 levels) in <top (required)>'
     # ./spec/spec_helper.rb:73:in `block (3 levels) in <top (required)>'
     # ./spec/manageiq/spec/support/evm_spec_helper.rb:35:in `clear_caches'
     # ./spec/spec_helper.rb:73:in `block (2 levels) in <top (required)>'

@ZitaNemeckova
Copy link
Contributor Author

@simaishi Here's fix #4754 for Gaprindashvili.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants