Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397811 )
Change subject: Fix Style/NumericLiterals RuboCop offense
......................................................................
Fix Style/NumericLiterals RuboCop offense
Change-Id: I0069ab8d7f637dfe79c574197ebaa0f923f9bf81
---
M .rubocop_todo.yml
M modules/base/files/monitoring/check_puppetrun
M modules/osm/spec/defines/osm_planet_sync_spec.rb
M modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
4 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d8321a1..b846cb4 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -80,9 +80,6 @@
Exclude:
- 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb'
-Style/NumericLiterals:
- MinDigits: 6
-
Style/ParallelAssignment:
Exclude:
- 'modules/wmflib/lib/puppet/parser/functions/to_milliseconds.rb'
diff --git a/modules/base/files/monitoring/check_puppetrun
b/modules/base/files/monitoring/check_puppetrun
index c4917a3..7ad4a4d 100755
--- a/modules/base/files/monitoring/check_puppetrun
+++ b/modules/base/files/monitoring/check_puppetrun
@@ -96,7 +96,12 @@
end
def time_ago(s)
- units = {86400 => 'day', 3600 => 'hour', 60 => 'minute', 1 => 'second'}
+ units = {
+ 24 * 60 * 60 => 'day',
+ 60 * 60 => 'hour',
+ 60 => 'minute',
+ 1 => 'second',
+ }
if s.zero?
return "0 seconds"
end
diff --git a/modules/osm/spec/defines/osm_planet_sync_spec.rb
b/modules/osm/spec/defines/osm_planet_sync_spec.rb
index 6ea4ad9..c4db303 100644
--- a/modules/osm/spec/defines/osm_planet_sync_spec.rb
+++ b/modules/osm/spec/defines/osm_planet_sync_spec.rb
@@ -14,7 +14,7 @@
let(:facts) { {
:lsbdistrelease => 'Precise',
:lsbdistid => 'Ubuntu',
- :memorysize_mb => 64420.94,
+ :memorysize_mb => 64 * 1024,
}}
it { should contain_cron('planet_sync-somedb') }
@@ -26,7 +26,7 @@
let(:facts) { {
:lsbdistrelease => 'Jessie',
:lsbdistid => 'Debian',
- :memorysize_mb => 64420.94,
+ :memorysize_mb => 64 * 1024,
}}
it { should
contain_file('/usr/local/bin/replicate-osm').with_content(/--input-reader xml/)
}
end
diff --git a/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
b/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
index 382396d..7da142b 100644
--- a/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
@@ -64,9 +64,9 @@
when 'hourly'
mins = 60
when 'daily'
- mins = 1440
+ mins = 24 * 60
when 'weekly'
- mins = 10080
+ mins = 7 * 24 * 60
else
raise(Puppet::ParseError, 'cron_splay(): invalid period')
end
--
To view, visit https://gerrit.wikimedia.org/r/397811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0069ab8d7f637dfe79c574197ebaa0f923f9bf81
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
