Lint and rubocop (autofixes only) #289
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ekohl
approved these changes
Mar 8, 2019
| @@ -2,12 +2,12 @@ | |||
|
|
|||
| # CentOS 6 Redis package is too old for Sentinel (2.4.10, needs 2.8+) | |||
| describe 'redis::sentinel', unless: (fact('osfamily') == 'RedHat' && (fact('operatingsystemmajrelease') == '6')) do | |||
| case fact('osfamily') | |||
| redis_name = case fact('osfamily') | |||
| when 'Debian' | |||
| @@ -20,7 +20,7 @@ module Puppet::Parser::Functions | |||
| DOC | |||
| ) do |args| | |||
|
|
|||
| raise(Puppet::ParseError, "redisget(): Wrong number of arguments given (#{args.size} for 2 or 3)") if args.size != 2 and args.size != 3 | |||
| raise(Puppet::ParseError, "redisget(): Wrong number of arguments given (#{args.size} for 2 or 3)") if args.size !=2 && args.size !=3 | |||
spec/functions/redisget_spec.rb
Outdated
| @@ -72,7 +72,7 @@ | |||
| end | |||
|
|
|||
| describe 'when an invalid type (non-string) is specified' do | |||
| before(:each) { | |||
| before { | |||
spec/classes/redis_spec.rb
Outdated
| @@ -926,7 +926,8 @@ | |||
|
|
|||
| it { is_expected.to contain_file(config_file_orig).with( | |||
There was a problem hiding this comment.
I think it's cleaner do use it do ... end (multi line) or it { is_expected.to contain_file(config_file_orig).with_content(/^slaveof _VALUE_/) }
| @@ -5,24 +5,24 @@ | |||
|
|
|||
| it do | |||
| is_expected.to contain_sysctl('vm.overcommit_memory').with( | |||
| 'ensure' => 'present', | |||
There was a problem hiding this comment.
Funny, this indentation was generated by another refactor
spec/classes/redis_sentinel_spec.rb
Outdated
| @@ -52,15 +52,15 @@ | |||
| 'mode' => '0644', | |||
| 'owner' => 'redis', | |||
| 'content' => $expected_noparams_content | |||
| ) | |||
There was a problem hiding this comment.
This was also generated by another change.
There was a problem hiding this comment.
Doing fixes one cop at a time, I make sure I don't unfix cops I've already fixed (or introduce entirely new failing cops). For the ones I haven't, the number of failures can and does tend to increase though.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is in preparation of doing the first Vox Pupuli modulesync.
The following cops can not be autocorrected.