Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333678 )
Change subject: squid3: switch to puppetlabs_spec_helper/rake_tasks
......................................................................
squid3: switch to puppetlabs_spec_helper/rake_tasks
Remove our custom cruft in favor of puppetlabs_spec_helper rake task.
Populate the stdlib and wmflib modules via .fixtures.yml.
Drop empty site.pp fixture, it is created on demand.
Change-Id: I7340b10b567c4cb79dae0e19da3d05f552c1b32b
---
A modules/squid3/.fixtures.yml
M modules/squid3/Rakefile
D modules/squid3/spec/fixtures/manifests/site.pp
3 files changed, 6 insertions(+), 45 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/squid3/.fixtures.yml b/modules/squid3/.fixtures.yml
new file mode 100644
index 0000000..20f1b81
--- /dev/null
+++ b/modules/squid3/.fixtures.yml
@@ -0,0 +1,5 @@
+fixtures:
+ symlinks:
+ squid3: "#{source_dir}"
+ stdlib: "../../../../stdlib"
+ wmflib: "../../../../wmflib"
diff --git a/modules/squid3/Rakefile b/modules/squid3/Rakefile
index 5bed768..cd3d379 100644
--- a/modules/squid3/Rakefile
+++ b/modules/squid3/Rakefile
@@ -1,45 +1 @@
-require 'rake'
-require 'fileutils'
-
-require 'rspec/core/rake_task'
-
-extra_modules = [ 'wmflib', 'stdlib' ]
-
-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/squid3/spec/fixtures/manifests/site.pp
b/modules/squid3/spec/fixtures/manifests/site.pp
deleted file mode 100644
index e69de29..0000000
--- a/modules/squid3/spec/fixtures/manifests/site.pp
+++ /dev/null
--
To view, visit https://gerrit.wikimedia.org/r/333678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7340b10b567c4cb79dae0e19da3d05f552c1b32b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
