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

Fix tests we missed in PR #897 #905

Merged
merged 1 commit into from
Mar 12, 2019
Merged

Conversation

mturley
Copy link
Contributor

@mturley mturley commented Mar 12, 2019

Associated RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1688951

I didn't realize that there were snapshot test failures when I merged #897... Travis CI failed to run on that PR! I should have noticed the lack of a green checkmark there.

I'll investigate what's going on with Travis, but master is broken right now, @mzazrivec can you merge this one for me when you get a chance? Nevermind, I got anxious and self-merged 👀 sorry I know that's a no-no. I'll avoid it in the future.

@mturley
Copy link
Contributor Author

mturley commented Mar 12, 2019

We'll need to put the same BZ on this one that we do for #897, for the throttling changes, which I can't find at the moment.

@miq-bot
Copy link
Member

miq-bot commented Mar 12, 2019

Checked commit mturley@0fe65b1 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
0 files checked, 0 offenses detected
Everything looks fine. 🍪

@mturley
Copy link
Contributor Author

mturley commented Mar 12, 2019

I'm actually going to go ahead and self-merge this so we don't leave master in the red overnight.

@mturley mturley merged commit d462568 into ManageIQ:master Mar 12, 2019
@mturley mturley deleted the fix-bad-snapshots branch March 12, 2019 21:47
@mturley
Copy link
Contributor Author

mturley commented Mar 14, 2019

@mturley mturley added v1.2 bz Issues filed by QE or having a BZ and removed v1.1 bugzilla needed labels Mar 25, 2019
simaishi pushed a commit that referenced this pull request Apr 5, 2019
@simaishi
Copy link
Contributor

simaishi commented Apr 5, 2019

Hammer backport details:

$ git log -1
commit 396d010a7826f42ed338b288dedb8291cf312edc
Author: Mike Turley <[email protected]>
Date:   Tue Mar 12 17:47:31 2019 -0400

    Merge pull request #905 from mturley/fix-bad-snapshots
    
    Fix tests we missed in PR #897
    
    (cherry picked from commit d462568426622038f4835a68f8e02f9ed1b70067)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1693746

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug bz Issues filed by QE or having a BZ hammer/backported v1.2 z-stream
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants