Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/254855
Change subject: RuboCop: Fixed Style/BlockDelimiters offense ...................................................................... RuboCop: Fixed Style/BlockDelimiters offense More information: https://github.com/bbatsov/ruby-style-guide#single-line-blocks Bug: T112651 Change-Id: I29ecae6b6ca753572b61d5352be6c12f3edf35b2 --- M .rubocop_todo.yml M modules/backup/spec/defines/schedule_spec.rb M modules/backup/spec/defines/set_spec.rb M modules/backup/spec/defines/weeklyschedule_spec.rb M modules/bacula/spec/classes/bacula_client_spec.rb M modules/bacula/spec/classes/bacula_director_spec.rb M modules/bacula/spec/classes/bacula_storage_spec.rb M modules/bacula/spec/defines/catalog_spec.rb M modules/bacula/spec/defines/fileset_spec.rb M modules/bacula/spec/defines/job_spec.rb M modules/bacula/spec/defines/jobdefaults_spec.rb M modules/bacula/spec/defines/mysql-bpipe_spec.rb M modules/bacula/spec/defines/pool_spec.rb M modules/bacula/spec/defines/schedule_spec.rb M modules/bacula/spec/defines/storage_device_spec.rb M modules/base/lib/facter/physicalcorecount.rb M modules/base/spec/defines/service_unit_spec.rb M modules/git/spec/defines/user_spec.rb M modules/graphite/lib/puppet/parser/functions/configparser_format.rb M modules/osm/spec/classes/osm_spec.rb M modules/osm/spec/defines/osm_planet_import_spec.rb M modules/osm/spec/defines/osm_planet_sync_spec.rb M modules/osm/spec/defines/osm_shapefile_import_spec.rb M modules/osm/spec/defines/osm_usergrants_spec.rb M modules/postgresql/spec/classes/postgresql_ganglia.rb M modules/postgresql/spec/classes/postgresql_master_spec.rb M modules/postgresql/spec/classes/postgresql_postgis_spec.rb M modules/postgresql/spec/classes/postgresql_server_spec.rb M modules/postgresql/spec/classes/postgresql_slave_spec.rb M modules/postgresql/spec/defines/postgresql_spatial_db_spec.rb M modules/postgresql/spec/defines/postgresql_user_spec.rb M modules/puppetmaster/files/puppetstoredconfigclean.rb M modules/servermon/spec/classes/servermon_app_spec.rb 33 files changed, 116 insertions(+), 122 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/254855/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 2dfe96a..61bf4ef 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -77,12 +77,6 @@ Exclude: - 'modules/puppetmaster/lib/puppet/reports/logstash.rb' -# Offense count: 58 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods. -Style/BlockDelimiters: - Enabled: false - # Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep. diff --git a/modules/backup/spec/defines/schedule_spec.rb b/modules/backup/spec/defines/schedule_spec.rb index 0962a86..873a005 100644 --- a/modules/backup/spec/defines/schedule_spec.rb +++ b/modules/backup/spec/defines/schedule_spec.rb @@ -2,10 +2,10 @@ describe 'backup::schedule', :type => :define do let(:title) { 'something' } - let(:params) { { + let(:params) do { :pool => 'unimportant', } - } + end let(:pre_condition) do [ 'define bacula::director::jobdefaults($when, $pool) {}', diff --git a/modules/backup/spec/defines/set_spec.rb b/modules/backup/spec/defines/set_spec.rb index bd005a5..4506ec8 100644 --- a/modules/backup/spec/defines/set_spec.rb +++ b/modules/backup/spec/defines/set_spec.rb @@ -2,10 +2,10 @@ describe 'backup::set', :type => :define do let(:title) { 'something' } - let(:params) { { + let(:params) do { :jobdefaults => 'unimportant', } - } + end let(:pre_condition) do [ 'File <| |>', diff --git a/modules/backup/spec/defines/weeklyschedule_spec.rb b/modules/backup/spec/defines/weeklyschedule_spec.rb index 6a35dd2..10ec19f 100644 --- a/modules/backup/spec/defines/weeklyschedule_spec.rb +++ b/modules/backup/spec/defines/weeklyschedule_spec.rb @@ -2,10 +2,10 @@ describe 'backup::weeklyschedule', :type => :define do let(:title) { 'something' } - let(:params) { { + let(:params) do { :pool => 'unimportant', } - } + end let(:pre_condition) do [ 'define bacula::director::jobdefaults($when, $pool) {}', diff --git a/modules/bacula/spec/classes/bacula_client_spec.rb b/modules/bacula/spec/classes/bacula_client_spec.rb index c289d4c..0d465c2 100644 --- a/modules/bacula/spec/classes/bacula_client_spec.rb +++ b/modules/bacula/spec/classes/bacula_client_spec.rb @@ -2,7 +2,7 @@ describe 'bacula::client', :type => :class do let(:node) { 'testhost.example.com' } - let(:params) { { + let(:params) do { :director => 'testdirector', :catalog => 'testcatalog', :file_retention => 'testfr', @@ -10,7 +10,7 @@ :fdport => '2000', :directorpassword => 'testdirectorpass', } - } + end it { should contain_package('bacula-fd') } it { should contain_service('bacula-fd') } diff --git a/modules/bacula/spec/classes/bacula_director_spec.rb b/modules/bacula/spec/classes/bacula_director_spec.rb index 589c188..a92923a 100644 --- a/modules/bacula/spec/classes/bacula_director_spec.rb +++ b/modules/bacula/spec/classes/bacula_director_spec.rb @@ -2,13 +2,13 @@ describe 'bacula::director', :type => :class do let(:node) { 'testhost.example.com' } - let(:params) { { + let(:params) do { :max_dir_concur_jobs => '10', :sqlvariant => 'testsql', :dir_port => '9900', :bconsolepassword => 'bconsolepass', } - } + end it { should contain_package('bacula-director-testsql') } it { should contain_service('bacula-director') } diff --git a/modules/bacula/spec/classes/bacula_storage_spec.rb b/modules/bacula/spec/classes/bacula_storage_spec.rb index e33364e..3e7b150 100644 --- a/modules/bacula/spec/classes/bacula_storage_spec.rb +++ b/modules/bacula/spec/classes/bacula_storage_spec.rb @@ -2,14 +2,14 @@ describe 'bacula::storage', :type => :class do let(:node) { 'testhost.example.com' } - let(:params) { { + let(:params) do { :director => 'testdirector', :sd_max_concur_jobs => '10', :sqlvariant => 'testsql', :sd_port => '9000', :directorpassword => 'testdirectorpass', } - } + end it { should contain_package('bacula-sd-testsql') } it { should contain_service('bacula-sd') } diff --git a/modules/bacula/spec/defines/catalog_spec.rb b/modules/bacula/spec/defines/catalog_spec.rb index 4787b31..eb72e5b 100644 --- a/modules/bacula/spec/defines/catalog_spec.rb +++ b/modules/bacula/spec/defines/catalog_spec.rb @@ -2,14 +2,14 @@ describe 'bacula::director::catalog', :type => :define do let(:title) { 'something' } - let(:params) { { + let(:params) do { :dbname => 'bacula', :dbuser => 'bacula', :dbhost => 'bacula-db.example.org', :dbport => '3306', :dbpassword => 'bacula', } - } + end it 'should create valid content for /etc/bacula/conf.d/catalog-something.conf' do should contain_file('/etc/bacula/conf.d/catalog-something.conf').with({ diff --git a/modules/bacula/spec/defines/fileset_spec.rb b/modules/bacula/spec/defines/fileset_spec.rb index f494abe..a492eb5 100644 --- a/modules/bacula/spec/defines/fileset_spec.rb +++ b/modules/bacula/spec/defines/fileset_spec.rb @@ -22,11 +22,11 @@ end context 'with excludes' do - let(:params) { { + let(:params) do { :includes => [ "/", "/var",], :excludes => [ "/tmp", ], } - } + end it 'should create valid content for /etc/bacula/conf.d/fileset-something.conf' do should contain_file('/etc/bacula/conf.d/fileset-something.conf') \ .with_content(/File = \//) \ diff --git a/modules/bacula/spec/defines/job_spec.rb b/modules/bacula/spec/defines/job_spec.rb index 58c2e28..8329a9b 100644 --- a/modules/bacula/spec/defines/job_spec.rb +++ b/modules/bacula/spec/defines/job_spec.rb @@ -2,9 +2,9 @@ describe 'bacula::client::job', :type => :define do let(:title) { 'something' } - let(:params) { { + let(:params) do { :fileset => 'root', :jobdefaults => 'testdefaults', } - } + end end diff --git a/modules/bacula/spec/defines/jobdefaults_spec.rb b/modules/bacula/spec/defines/jobdefaults_spec.rb index f9873c1..6a8b36a 100644 --- a/modules/bacula/spec/defines/jobdefaults_spec.rb +++ b/modules/bacula/spec/defines/jobdefaults_spec.rb @@ -2,11 +2,11 @@ describe 'bacula::director::jobdefaults', :type => :define do let(:title) { 'something' } - let(:params) { { + let(:params) do { :when => 'never', :pool => 'testpool', } - } + end it 'should create /etc/bacula/conf.d/jobdefaults-something.conf' do should contain_file('/etc/bacula/conf.d/jobdefaults-something.conf').with({ diff --git a/modules/bacula/spec/defines/mysql-bpipe_spec.rb b/modules/bacula/spec/defines/mysql-bpipe_spec.rb index 4e7cdd5..980cfa0 100644 --- a/modules/bacula/spec/defines/mysql-bpipe_spec.rb +++ b/modules/bacula/spec/defines/mysql-bpipe_spec.rb @@ -4,66 +4,66 @@ let(:title) { 'something' } context 'with per database' do - let(:params) { { + let(:params) do { :per_database => true, :xtrabackup => false, :pigz_level => 'fast', :is_slave => false, :mysqldump_innodb_only => false, } - } + end it { should contain_file('/etc/bacula/scripts/something').with_content(/for database/) } end context 'with not per database' do - let(:params) { { + let(:params) do { :per_database => false, :xtrabackup => false, :pigz_level => 'fast', :is_slave => false, :mysqldump_innodb_only => false, } - } + end it { should contain_file('/etc/bacula/scripts/something').with_content(/alldatabases/) } end context 'with xtrabackup' do - let(:params) { { + let(:params) do { :per_database => false, :xtrabackup => true, :pigz_level => 'fast', :is_slave => false, :mysqldump_innodb_only => false, } - } + end it { should contain_file('/etc/bacula/scripts/something').with_content(/XTRABACKUP/) } end context 'with is_slave' do - let(:params) { { + let(:params) do { :per_database => false, :xtrabackup => false, :pigz_level => 'fast', :is_slave => true, :mysqldump_innodb_only => false, } - } + end it { should contain_file('/etc/bacula/scripts/something').with_content(/slave/) } end context 'with innodb_only' do - let(:params) { { + let(:params) do { :per_database => false, :xtrabackup => false, :pigz_level => 'fast', :is_slave => false, :mysqldump_innodb_only => true, } - } + end it { should contain_file('/etc/bacula/scripts/something').with_content(/single-transcation/) } end context 'with local_dump_dir' do - let(:params) { { + let(:params) do { :per_database => false, :xtrabackup => false, :pigz_level => 'fast', @@ -71,18 +71,18 @@ :mysqldump_innodb_only => true, :local_dump_dir => '/var/backup', } - } + end it { should contain_file('/etc/bacula/scripts/something').with_content(/\$TEE \$LOCALDUMPDIR/) } end context 'without local_dump_dir' do - let(:params) { { + let(:params) do { :per_database => false, :xtrabackup => false, :pigz_level => 'fast', :is_slave => false, :mysqldump_innodb_only => true, } - } + end it { should contain_file('/etc/bacula/scripts/something').with_content(/^[\$TEE \$LOCALDUMPDIR]/) } end end diff --git a/modules/bacula/spec/defines/pool_spec.rb b/modules/bacula/spec/defines/pool_spec.rb index eb98b8d..3ccdd3f 100644 --- a/modules/bacula/spec/defines/pool_spec.rb +++ b/modules/bacula/spec/defines/pool_spec.rb @@ -2,12 +2,12 @@ describe 'bacula::director::pool', :type => :define do let(:title) { 'something' } - let(:params) { { + let(:params) do { :max_vols => '10', :storage => 'teststorage', :volume_retention => '10 days', } - } + end context 'without label_fmt, max_vol_bytes' do it 'should create /etc/bacula/conf.d/pool-something.conf' do @@ -28,26 +28,26 @@ end context 'with max_vol_bytes' do - let(:params) { { + let(:params) do { :max_vols => '10', :storage => 'teststorage', :volume_retention => '10 days', :max_vol_bytes => '2000', } - } + end it 'should create /etc/bacula/conf.d/pool-something.conf' do should contain_file('/etc/bacula/conf.d/pool-something.conf') \ .with_content(/Maximum Volume Bytes = 2000/) \ end end context 'with max_vol_bytes' do - let(:params) { { + let(:params) do { :max_vols => '10', :storage => 'teststorage', :volume_retention => '10 days', :label_fmt => 'TEST', } - } + end it 'should create /etc/bacula/conf.d/pool-something.conf' do should contain_file('/etc/bacula/conf.d/pool-something.conf') \ .with_content(/Label Format = "TEST"/) \ diff --git a/modules/bacula/spec/defines/schedule_spec.rb b/modules/bacula/spec/defines/schedule_spec.rb index 7db8c82..cc42ed5 100644 --- a/modules/bacula/spec/defines/schedule_spec.rb +++ b/modules/bacula/spec/defines/schedule_spec.rb @@ -2,13 +2,13 @@ describe 'bacula::director::schedule', :type => :define do let(:title) { 'something' } - let(:params) { { + let(:params) do { :runs => [ { 'level' => 'Full', 'at' => '1st Sat at 00:00'}, { 'level' => 'Differential', 'at' => '3rd Sat at 00:00'}, ] } - } + end it 'should create /etc/bacula/conf.d/schedule-something.conf' do should contain_file('/etc/bacula/conf.d/schedule-something.conf').with({ diff --git a/modules/bacula/spec/defines/storage_device_spec.rb b/modules/bacula/spec/defines/storage_device_spec.rb index 8b83ff6..7434219 100644 --- a/modules/bacula/spec/defines/storage_device_spec.rb +++ b/modules/bacula/spec/defines/storage_device_spec.rb @@ -2,13 +2,13 @@ describe 'bacula::storage::device', :type => :define do let(:title) { 'something' } - let(:params) { { + let(:params) do { :device_type => 'File', :media_type => 'File', :archive_device => '/dev/nst0', :max_concur_jobs => '10', } - } + end context 'without spool_dir, max_spool_size' do it 'should create /etc/bacula/sd-devices.d/something.conf' do @@ -27,7 +27,7 @@ end context 'with spool_dir, max_spool_size' do - let(:params) { { + let(:params) do { :device_type => 'File', :media_type => 'File', :archive_device => '/dev/nst0', @@ -35,7 +35,7 @@ :spool_dir => '/tmp', :max_spool_size => '100', } - } + end it 'should create /etc/bacula/sd-devices.d/something.conf' do should contain_file('/etc/bacula/sd-devices.d/something.conf') \ diff --git a/modules/base/lib/facter/physicalcorecount.rb b/modules/base/lib/facter/physicalcorecount.rb index 2e6456e..7e3c719 100644 --- a/modules/base/lib/facter/physicalcorecount.rb +++ b/modules/base/lib/facter/physicalcorecount.rb @@ -5,8 +5,8 @@ Facter.add("physicalcorecount") do setcode do - Pathname::glob('/sys/devices/system/cpu/cpu[0-9]*/topology/thread_siblings_list').map{|x| + Pathname::glob('/sys/devices/system/cpu/cpu[0-9]*/topology/thread_siblings_list').map do|x| File.open(x,'r').read().split(',')[0] - }.sort.uniq.count + end.sort.uniq.count end end diff --git a/modules/base/spec/defines/service_unit_spec.rb b/modules/base/spec/defines/service_unit_spec.rb index 6be090c..7557c27 100644 --- a/modules/base/spec/defines/service_unit_spec.rb +++ b/modules/base/spec/defines/service_unit_spec.rb @@ -40,9 +40,9 @@ let(:params) { { :ensure => 'present', :sysvinit => true, :refresh => false}} it 'should not refresh service' do - expect { + expect do should contain_file('/etc/init.d/nginx').that_notifies('Service[nginx]') - }.to raise_error() + end.to raise_error() end end diff --git a/modules/git/spec/defines/user_spec.rb b/modules/git/spec/defines/user_spec.rb index 1bdd2fa..8c0f160 100644 --- a/modules/git/spec/defines/user_spec.rb +++ b/modules/git/spec/defines/user_spec.rb @@ -11,7 +11,7 @@ let(:title) { 'gitconfig' } context "Setting up user name and email" do - let(:params) { { + let(:params) do { :homedir => '/tmp/foo', :settings => { 'user' => { @@ -19,12 +19,12 @@ 'email' => 'has...@free.fr', } } } - } - it { should contain_file('/tmp/foo/.gitconfig') \ + end + it do should contain_file('/tmp/foo/.gitconfig') \ .with_content(/[user]\n/) \ .with_content(/name = Antoine Musso\n/) \ .with_content(/email = has...@free.fr\n/) - } + end end end diff --git a/modules/graphite/lib/puppet/parser/functions/configparser_format.rb b/modules/graphite/lib/puppet/parser/functions/configparser_format.rb index c0b7629..1aa2d68 100644 --- a/modules/graphite/lib/puppet/parser/functions/configparser_format.rb +++ b/modules/graphite/lib/puppet/parser/functions/configparser_format.rb @@ -6,29 +6,29 @@ def rmerge(*args) # Recursively merge hashes. merged = args.shift.clone - args.each { |hash| - merged.merge!(hash) { |k, old, new| + args.each do |hash| + merged.merge!(hash) do |k, old, new| merged[k] = old.is_a?(Hash) && new.is_a?(Hash) ? rmerge(old, new) : new - } - } + end + end return merged end def configparser_format(config) # Serialize a hash to Python ConfigParser format. - config.sort.map { |section,items| + config.sort.map do |section,items| ["[#{section}]"].concat items.sort.map { |k,v| v = v.is_a?(Array) ? v.join(',') : ( v == :undef ? '' : v ) "#{k} = #{v}" }.push [] - }.join("\n") + end.join("\n") end module Puppet::Parser::Functions - newfunction(:configparser_format, :type => :rvalue) { |args| + newfunction(:configparser_format, :type => :rvalue) do |args| unless args.any? and args.all? { |a| a.is_a? Hash } fail 'configparser_format() requires one or more hash arguments' end configparser_format(rmerge(*args)) - } + end end diff --git a/modules/osm/spec/classes/osm_spec.rb b/modules/osm/spec/classes/osm_spec.rb index a58f4c3..e8c4e2d 100644 --- a/modules/osm/spec/classes/osm_spec.rb +++ b/modules/osm/spec/classes/osm_spec.rb @@ -1,10 +1,10 @@ require 'spec_helper' describe 'osm', :type => :class do - let(:params) { { + let(:params) do { :ensure => 'present', } - } + end context 'ensure present' do it { should contain_package('osm2pgsql').with_ensure('present') } @@ -13,10 +13,10 @@ end describe 'osm', :type => :class do - let(:params) { { + let(:params) do { :ensure => 'absent', } - } + end context 'ensure absent' do it { should contain_package('osm2pgsql').with_ensure('absent') } diff --git a/modules/osm/spec/defines/osm_planet_import_spec.rb b/modules/osm/spec/defines/osm_planet_import_spec.rb index 87a7304..a9862cb 100644 --- a/modules/osm/spec/defines/osm_planet_import_spec.rb +++ b/modules/osm/spec/defines/osm_planet_import_spec.rb @@ -2,14 +2,14 @@ describe 'osm::planet_import', :type => :define do let(:title) { 'somedb' } - let(:facts) { { + let(:facts) do { :memoryfree => '1000 MB', } - } - let(:params) { { + end + let(:params) do { :input_pbf_file => '/nonexistent', } - } + end context 'with ensure present' do it { should contain_exec('load_900913-somedb') } it { should contain_exec('load_planet_osm-somedb') } diff --git a/modules/osm/spec/defines/osm_planet_sync_spec.rb b/modules/osm/spec/defines/osm_planet_sync_spec.rb index a669991..77fada1 100644 --- a/modules/osm/spec/defines/osm_planet_sync_spec.rb +++ b/modules/osm/spec/defines/osm_planet_sync_spec.rb @@ -2,15 +2,15 @@ describe 'osm::planet_sync', :type => :define do let(:title) { 'somedb' } - let(:facts) { { + let(:facts) do { :memoryfree => '1000 MB', } - } - let(:params) { { + end + let(:params) do { :osmosis_dir => '/srv/osmosis', :period => 'minute', } - } + end context 'with ensure present' do it { should contain_cron('planet_sync-somedb') } it { should contain_file('/srv/osmosis/configuration.txt').with_content(/minute/) } diff --git a/modules/osm/spec/defines/osm_shapefile_import_spec.rb b/modules/osm/spec/defines/osm_shapefile_import_spec.rb index 8be03ad..20bd630 100644 --- a/modules/osm/spec/defines/osm_shapefile_import_spec.rb +++ b/modules/osm/spec/defines/osm_shapefile_import_spec.rb @@ -2,12 +2,12 @@ describe 'osm::shapefile_import', :type => :define do let(:title) { 'somedb-shapefile1' } - let(:params) { { + let(:params) do { :database => 'gis', :input_shape_file => '/nonexistent', :shape_table => 'shapes', } - } + end context 'with ensure present' do it { should contain_exec('create_shapelines-somedb-shapefile1') } it { should contain_exec('load_shapefiles-somedb-shapefile1') } diff --git a/modules/osm/spec/defines/osm_usergrants_spec.rb b/modules/osm/spec/defines/osm_usergrants_spec.rb index 3430159..ae305f5 100644 --- a/modules/osm/spec/defines/osm_usergrants_spec.rb +++ b/modules/osm/spec/defines/osm_usergrants_spec.rb @@ -2,11 +2,11 @@ describe 'osm::usergrants', :type => :define do let(:title) { 'somedb' } - let(:params) { { + let(:params) do { :postgresql_user => 'someuser', :ensure => 'present', } - } + end context 'with ensure present' do it { should contain_exec('grant_osm_rights-somedb') } end @@ -14,11 +14,11 @@ describe 'osm::usergrants', :type => :define do let(:title) { 'somedb' } - let(:params) { { + let(:params) do { :postgresql_user => 'someuser', :ensure => 'absent', } - } + end context 'with ensure absent' do it { should contain_exec('revoke_osm_rights-somedb') } end diff --git a/modules/postgresql/spec/classes/postgresql_ganglia.rb b/modules/postgresql/spec/classes/postgresql_ganglia.rb index 9f26c30..9415dfc 100644 --- a/modules/postgresql/spec/classes/postgresql_ganglia.rb +++ b/modules/postgresql/spec/classes/postgresql_ganglia.rb @@ -1,10 +1,10 @@ require 'spec_helper' describe 'postgresql::ganglia', :type => :class do - let(:params) { { + let(:params) do { :ensure => 'present', } - } + end context 'ensure present' do it { should contain_file('/usr/lib/ganglia/python_modules/postgresql.py').with_ensure('present') } @@ -13,10 +13,10 @@ end describe 'postgresql::slave', :type => :class do - let(:params) { { + let(:params) do { :ensure => 'absent', } - } + end context 'ensure absent' do it { should contain_file('/usr/lib/ganglia/python_modules/postgresql.py').with_ensure('absent') } diff --git a/modules/postgresql/spec/classes/postgresql_master_spec.rb b/modules/postgresql/spec/classes/postgresql_master_spec.rb index a4b0157..9c8d2e4 100644 --- a/modules/postgresql/spec/classes/postgresql_master_spec.rb +++ b/modules/postgresql/spec/classes/postgresql_master_spec.rb @@ -1,12 +1,12 @@ require 'spec_helper' describe 'postgresql::master', :type => :class do - let(:params) { { + let(:params) do { :pgversion => '9.1', :ensure => 'present', :master_server => 'test', } - } + end context 'ensure present' do it { should contain_class('postgresql::server') } @@ -26,12 +26,12 @@ end describe 'postgresql::master', :type => :class do - let(:params) { { + let(:params) do { :pgversion => '9.1', :ensure => 'absent', :master_server => 'test', } - } + end context 'ensure absent' do it { should contain_class('postgresql::server') } diff --git a/modules/postgresql/spec/classes/postgresql_postgis_spec.rb b/modules/postgresql/spec/classes/postgresql_postgis_spec.rb index aca9d8b..c8964c1 100644 --- a/modules/postgresql/spec/classes/postgresql_postgis_spec.rb +++ b/modules/postgresql/spec/classes/postgresql_postgis_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' describe 'postgresql::postgis', :type => :class do - let(:params) { { + let(:params) do { :pgversion => '9.1', :ensure => 'present', } - } + end context 'ensure present' do it { should contain_package('postgresql-9.1-postgis').with_ensure('present') } @@ -13,11 +13,11 @@ end describe 'postgresql::postgis', :type => :class do - let(:params) { { + let(:params) do { :pgversion => '9.1', :ensure => 'absent', } - } + end context 'ensure absent' do it { should contain_package('postgresql-9.1-postgis').with_ensure('absent') } diff --git a/modules/postgresql/spec/classes/postgresql_server_spec.rb b/modules/postgresql/spec/classes/postgresql_server_spec.rb index 18a25d4..1e86869 100644 --- a/modules/postgresql/spec/classes/postgresql_server_spec.rb +++ b/modules/postgresql/spec/classes/postgresql_server_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' describe 'postgresql::server', :type => :class do - let(:params) { { + let(:params) do { :pgversion => '9.1', :ensure => 'present', } - } + end context 'ensure present' do it { should contain_package('postgresql-9.1').with_ensure('present') } @@ -24,11 +24,11 @@ end describe 'postgresql::server', :type => :class do - let(:params) { { + let(:params) do { :pgversion => '9.1', :ensure => 'absent', } - } + end context 'ensure absent' do it { should contain_package('postgresql-9.1').with_ensure('absent') } @@ -46,12 +46,12 @@ end describe 'postgresql::server', :type => :class do - let(:params) { { + let(:params) do { :pgversion => '9.1', :ensure => 'absent', :includes => ['a.conf', 'b.conf'], } - } + end context 'with includes' do it { should contain_file('/etc/postgresql/9.1/main/postgresql.conf').with_content(/include 'a.conf'/) } diff --git a/modules/postgresql/spec/classes/postgresql_slave_spec.rb b/modules/postgresql/spec/classes/postgresql_slave_spec.rb index 283143c..a571eb8 100644 --- a/modules/postgresql/spec/classes/postgresql_slave_spec.rb +++ b/modules/postgresql/spec/classes/postgresql_slave_spec.rb @@ -1,13 +1,13 @@ require 'spec_helper' describe 'postgresql::slave', :type => :class do - let(:params) { { + let(:params) do { :pgversion => '9.1', :ensure => 'present', :master_server => 'test', :replication_pass => 'pass', } - } + end context 'ensure present' do it { should contain_class('postgresql::server') } @@ -27,14 +27,14 @@ end describe 'postgresql::slave', :type => :class do - let(:params) { { + let(:params) do { :pgversion => '9.1', :ensure => 'present', :master_server => 'test', :replication_pass => 'pass', :datadir => '/srv/postgres/9.1/main', } - } + end context 'ensure present' do it { should contain_class('postgresql::server') } it do @@ -53,13 +53,13 @@ end describe 'postgresql::slave', :type => :class do - let(:params) { { + let(:params) do { :pgversion => '9.1', :ensure => 'absent', :master_server => 'test', :replication_pass => 'pass', } - } + end context 'ensure absent' do it { should contain_class('postgresql::server') } diff --git a/modules/postgresql/spec/defines/postgresql_spatial_db_spec.rb b/modules/postgresql/spec/defines/postgresql_spatial_db_spec.rb index 8e49e10..8b12bd5 100644 --- a/modules/postgresql/spec/defines/postgresql_spatial_db_spec.rb +++ b/modules/postgresql/spec/defines/postgresql_spatial_db_spec.rb @@ -2,10 +2,10 @@ describe 'postgresql::spatialdb', :type => :define do let(:title) { 'somedb' } - let(:params) { { + let(:params) do { :ensure => 'present', } - } + end context 'with ensure present' do it { should contain_exec('create_db-somedb') } it { should contain_exec('create_plpgsql_lang-somedb') } @@ -18,10 +18,10 @@ describe 'postgresql::spatialdb', :type => :define do let(:title) { 'somedb' } - let(:params) { { + let(:params) do { :ensure => 'absent', } - } + end context 'with ensure absent' do it { should contain_exec('drop_db-somedb') } it { should contain_exec('drop_plpgsql_lang-somedb') } diff --git a/modules/postgresql/spec/defines/postgresql_user_spec.rb b/modules/postgresql/spec/defines/postgresql_user_spec.rb index 99c3e67..bfaa0aa 100644 --- a/modules/postgresql/spec/defines/postgresql_user_spec.rb +++ b/modules/postgresql/spec/defines/postgresql_user_spec.rb @@ -2,12 +2,12 @@ describe 'postgresql::user', :type => :define do let(:title) { 'someth...@host.example.com' } - let(:params) { { + let(:params) do { :user => 'something', :password => 'soemthing', :ensure => 'present', } - } + end context 'with ensure present' do it { should contain_exec('create_user-someth...@host.example.com') } it { should contain_exec('pass_set-someth...@host.example.com') } @@ -17,12 +17,12 @@ describe 'postgresql::user', :type => :define do let(:title) { 'someth...@host.example.com' } - let(:params) { { + let(:params) do { :user => 'something', :password => 'soemthing', :ensure => 'absent', } - } + end context 'with ensure absent' do it { should contain_exec('drop_user-someth...@host.example.com') } diff --git a/modules/puppetmaster/files/puppetstoredconfigclean.rb b/modules/puppetmaster/files/puppetstoredconfigclean.rb index dcbefa8..f7d673e 100644 --- a/modules/puppetmaster/files/puppetstoredconfigclean.rb +++ b/modules/puppetmaster/files/puppetstoredconfigclean.rb @@ -78,7 +78,7 @@ ActiveRecord::Base.establish_connection(args) -ARGV.each { |hostname| +ARGV.each do |hostname| if @host = Puppet::Rails::Host.find_by_name(hostname.strip) print "Killing #{hostname}..." $stdout.flush @@ -87,5 +87,5 @@ else puts "Can't find host #{hostname}." end -} +end exit 0 diff --git a/modules/servermon/spec/classes/servermon_app_spec.rb b/modules/servermon/spec/classes/servermon_app_spec.rb index bd51a90..ed50eea 100644 --- a/modules/servermon/spec/classes/servermon_app_spec.rb +++ b/modules/servermon/spec/classes/servermon_app_spec.rb @@ -1,13 +1,13 @@ require 'spec_helper' describe 'servermon', :type => :class do - let(:params) { { + let(:params) do { :ensure => 'present', :directory => '/tmp/test', :db_name => 'testdb', :secret_key => 'superdupersecret' } - } + end it { should contain_package('python-django') } it { should contain_package('python-django-south') } -- To view, visit https://gerrit.wikimedia.org/r/254855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29ecae6b6ca753572b61d5352be6c12f3edf35b2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Zfilipin <zfili...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
