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

Fixes #19664 - fix tests after admin made unavailable in taxonomies #6800

Merged
merged 1 commit into from
May 30, 2017

Conversation

ares
Copy link
Contributor

@ares ares commented May 25, 2017

No description provided.

@mention-bot
Copy link

@ares, thanks for your PR! By analyzing the history of the files in this pull request, we identified @parthaa, @ehelms and @jlsherrill to be potential reviewers.

@theforeman-bot
Copy link

There were the following issues with the commit message:

  • length of the first commit message line for 710188f2f4eeeaa3a4ef0c03338ffe0a428d84ce exceeds 65 characters

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@@ -88,7 +88,7 @@ module FixtureTestCase

Setting::Content.load_defaults

@@admin = ::User.find(FIXTURES['users']['admin']['id'])
@@admin = ::User.unscoped.find(FIXTURES['users']['admin']['id'])

Choose a reason for hiding this comment

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

Replace class var @@admin with a class instance var.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I hope I can ignore this :-)

Copy link
Member

Choose a reason for hiding this comment

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

@ares From @johnpmitsch on IRC - "can you add an exception for the class variable so rubocop ignores it?"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added on top of module

Copy link
Member

@jlsherrill jlsherrill May 25, 2017

Choose a reason for hiding this comment

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

so i think hound is throwing up an error here, we don't enable the class var cop for tests, and now rubocop is failing with:
W: Unnecessary disabling of Style/ClassVars.

in jenkins :(

It seems like hound doesn't honor .rubocop.yaml files in subdirectories: https://github.com/Katello/katello/blob/master/test/.rubocop.yml
hound--

Copy link
Member

Choose a reason for hiding this comment

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

i'm going to open a PR to move this to the top level rubocop.yml so that the behavior is consistent.

Copy link
Member

Choose a reason for hiding this comment

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

Still failing:
01:56:22.484 /var/lib/workspace/workspace/test_katello_pull_request/slave/fast/plugin/test/katello_test_helper.rb:65:1: W: Unnecessary disabling of Style/ClassVars.
01:56:22.484 # rubocop:disable Style/ClassVars

Copy link
Member

Choose a reason for hiding this comment

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

just remove that line, i think hound should now be fixed

@dLobatog
Copy link
Member

Seems good to me and tests passed. The commit summary length can be fixed on merge. Thanks @ares

@theforeman-bot
Copy link

There were the following issues with the commit message:

  • length of the first commit message line for 6392de05ab80af5e90e56ad0165a2673ebe51ae5 exceeds 65 characters

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@theforeman-bot
Copy link

There were the following issues with the commit message:

  • length of the first commit message line for 611a59217c3d885ddd14261f6388d4d67ed0d930 exceeds 65 characters

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@theforeman-bot
Copy link

There were the following issues with the commit message:

  • length of the first commit message line for 24744b8ed53fe844de265d08d0556b6b3e06eaa5 exceeds 65 characters

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@ares
Copy link
Contributor Author

ares commented May 30, 2017

There's still one issue when combined with Foreman PR, it seems that some foreman task test fails, investigating.

@ares
Copy link
Contributor Author

ares commented May 30, 2017

The problem is now on with foreman-tasks, opened theforeman/foreman-tasks#252 but there's not way to run tests in jenkins with PR from core, katello and foreman-tasks at the same time.

I spoke with Ivan, the patch seems alright and the foreman-tasks release is planned for this afternoon, then I can rerun the tests which should confirm that this PR will keep Katello tests running after CVE PR is merged.

@jlsherrill
Copy link
Member

ACK thanks @ares

@jlsherrill jlsherrill merged commit c469665 into Katello:master May 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants