Gehel has submitted this change and it was merged. Change subject: servermon: simplify tests with puppetlabs_spec_helper ......................................................................
servermon: simplify tests with puppetlabs_spec_helper Dramatically simplify the way we run tests. See change on the network module: https://gerrit.wikimedia.org/r/#/c/296821 $ bundle install $ cd modules/postgresql $ bundle exec rake spec Add wmflib module to .fixtures.yml Change-Id: I0650ff3325678523a07bfa9658ec06ff65643ad3 --- A modules/servermon/.fixtures.yml A modules/servermon/.gitignore M modules/servermon/Rakefile D modules/servermon/spec/fixtures/manifests/site.pp 4 files changed, 7 insertions(+), 47 deletions(-) Approvals: Gehel: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/servermon/.fixtures.yml b/modules/servermon/.fixtures.yml new file mode 100644 index 0000000..4bc5140 --- /dev/null +++ b/modules/servermon/.fixtures.yml @@ -0,0 +1,4 @@ +fixtures: + symlinks: + servermon: "#{source_dir}" + wmflib: "../../../../wmflib" diff --git a/modules/servermon/.gitignore b/modules/servermon/.gitignore new file mode 100644 index 0000000..e477cf8 --- /dev/null +++ b/modules/servermon/.gitignore @@ -0,0 +1,2 @@ +spec/fixtures/manifests/site.pp +spec/fixtures/modules/ diff --git a/modules/servermon/Rakefile b/modules/servermon/Rakefile index 165b532..cd3d379 100644 --- a/modules/servermon/Rakefile +++ b/modules/servermon/Rakefile @@ -1,47 +1 @@ -require 'rake' -require 'fileutils' - -require 'rspec/core/rake_task' - -# Note: The nginx puppet module is a git submodule right now, so don't forget to -# checkout submodules before testing -extra_modules = [ 'wmflib' ] - -modulename = File.basename(File.expand_path(File.dirname(__FILE__))) - -symlinks = { 'spec/fixtures/modules/%s/files' % modulename => '../../../../files', - 'spec/fixtures/modules/%s/manifests' % modulename => '../../../../manifests', - 'spec/fixtures/modules/%s/templates' % modulename => '../../../../templates', -} - - -task :setup do - FileUtils.mkdir_p('spec/fixtures/modules/%s' % modulename) - extra_modules.each do |x| - FileUtils.ln_s('../../../../%s' % x, 'spec/fixtures/modules/%s' % x) - end - symlinks.each do |x| - if !File.exist?(x[0]) - FileUtils.ln_s(x[1], x[0]) - end - end -end - -task :teardown do - symlinks.each { |x| FileUtils.rm(x[0], :force => true) } - FileUtils.rmdir('spec/fixtures/modules/%s' % modulename) - extra_modules.each do |x| - FileUtils.rm('spec/fixtures/modules/%s' % x, :force => true) - end - FileUtils.rmdir('spec/fixtures/modules') -end - -RSpec::Core::RakeTask.new(:realspec) do |t| - t.fail_on_error = false - t.pattern = 'spec/*/*_spec.rb' -end - -task :spec => [ :setup, :realspec, :teardown] - -task :default => :spec do -end +require 'puppetlabs_spec_helper/rake_tasks' diff --git a/modules/servermon/spec/fixtures/manifests/site.pp b/modules/servermon/spec/fixtures/manifests/site.pp deleted file mode 100644 index e69de29..0000000 --- a/modules/servermon/spec/fixtures/manifests/site.pp +++ /dev/null -- To view, visit https://gerrit.wikimedia.org/r/296888 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0650ff3325678523a07bfa9658ec06ff65643ad3 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Gehel <gleder...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
