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

Fixes #24355 - Never override a smart class parameter on import #5885

Merged
merged 1 commit into from Jul 30, 2018

Conversation

Projects
None yet
4 participants
@orrabin
Member

orrabin commented Jul 28, 2018

No description provided.

@theforeman-bot

This comment has been minimized.

Show comment
Hide comment
@theforeman-bot
Member

theforeman-bot commented Jul 28, 2018

Issues: #24355

@ik5

A different test fails on me here:

E

Error:
PuppetClassImporterTest#test_0011_should detect correct environments for import:
ActiveSupport::DeprecationException: DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails. The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now). To maintain the current behavior, use `attribute_before_last_save` instead. (called from block in taxonomy_and_child_ids at /home/vagrant/foreman/app/models/user.rb:462)
    app/models/user.rb:462:in `block in taxonomy_and_child_ids'
    app/models/user.rb:461:in `taxonomy_and_child_ids'
    app/models/user.rb:468:in `location_and_child_ids'
    app/models/taxonomies/location.rb:21:in `block in <class:Location>'
    app/models/user.rb:430:in `my_locations'
    app/models/user.rb:435:in `taxonomy_ids'
    app/models/user.rb:443:in `visible_environments'
    app/services/puppet_class_importer.rb:174:in `actual_environments'
    app/services/puppet_class_importer.rb:23:in `changes'
    test/unit/puppet_class_importer_test.rb:265:in `block in <class:PuppetClassImporterTest>'

But it does not related to your code, it happens also on the upstream develop branch.

The effected line is the following:
importer = PuppetClassImporter.new(:url => proxy.url)

Does this issue happens to you as well?

@orrabin

This comment has been minimized.

Show comment
Hide comment
@orrabin

orrabin Jul 29, 2018

Member

If this happens to you for develop it's unrelated to this PR.
This passes for me locally and also passed in Jenkins.

Member

orrabin commented Jul 29, 2018

If this happens to you for develop it's unrelated to this PR.
This passes for me locally and also passed in Jenkins.

@tbrisker

Thanks @orrabin ! katello failure unrelated

@tbrisker tbrisker merged commit f22a6c6 into theforeman:develop Jul 30, 2018

6 of 7 checks passed

katello Build finished. 0 tests run, 0 skipped, 0 failed.
Details
Hound No violations found. Woof!
codeclimate All good!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
foreman Build finished. 34786 tests run, 5 skipped, 0 failed.
Details
prprocessor Commit message style is correct
Details
upgrade Build finished. No test results found.
Details
@tbrisker

This comment has been minimized.

Show comment
Hide comment
@tbrisker

tbrisker Jul 30, 2018

Member

please CP to all stable branches.

Member

tbrisker commented Jul 30, 2018

please CP to all stable branches.

@orrabin

This comment has been minimized.

Show comment
Hide comment
@orrabin

orrabin Jul 31, 2018

Member

@tbrisker I opened:
for 1.17: #5894
for 1.18: #5895
for 1.19: #5896

Member

orrabin commented Jul 31, 2018

@tbrisker I opened:
for 1.17: #5894
for 1.18: #5895
for 1.19: #5896

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