Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394270 )
Change subject: mirrors: puppet 4 spec compatibility
......................................................................
mirrors: puppet 4 spec compatibility
Change-Id: I5503ef502bd6c16770f99e83f2da917e33b725ae
---
M modules/mirrors/spec/classes/mirrors_debian_spec.rb
M modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
D modules/mirrors/spec/fixtures/manifests/site.pp
A modules/mirrors/spec/fixtures/modules/passwords/manifests/mirrors.pp
4 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mirrors/spec/classes/mirrors_debian_spec.rb
b/modules/mirrors/spec/classes/mirrors_debian_spec.rb
index bf168ff..c6ca028 100644
--- a/modules/mirrors/spec/classes/mirrors_debian_spec.rb
+++ b/modules/mirrors/spec/classes/mirrors_debian_spec.rb
@@ -1,6 +1,7 @@
require 'spec_helper'
describe 'mirrors::debian', :type => :class do
+ let(:code) { "class passwords::mirrors {}"}
it do
should contain_file('/srv/mirrors/debian').with({
'ensure' => 'directory',
@@ -18,7 +19,7 @@
})
end
it do
- should contain_file('/var/log/ftpsync/').with({
+ should contain_file('/var/log/ftpsync').with({
'ensure' => 'directory',
'owner' => 'mirror',
'group' => 'mirror',
diff --git a/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
b/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
index 3c72d73..b210601 100644
--- a/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
+++ b/modules/mirrors/spec/classes/mirrors_ubuntu_spec.rb
@@ -2,7 +2,7 @@
describe 'mirrors::ubuntu', :type => :class do
it do
- should contain_file('/srv/mirrors/ubuntu/').with({
+ should contain_file('/srv/mirrors/ubuntu').with({
'ensure' => 'directory',
'owner' => 'mirror',
'group' => 'mirror',
diff --git a/modules/mirrors/spec/fixtures/manifests/site.pp
b/modules/mirrors/spec/fixtures/manifests/site.pp
deleted file mode 100644
index 54f0d7f..0000000
--- a/modules/mirrors/spec/fixtures/manifests/site.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-# lint:ignore:autoloader_layout
-class passwords::mirrors {
-}
-# lint:endignore
diff --git
a/modules/mirrors/spec/fixtures/modules/passwords/manifests/mirrors.pp
b/modules/mirrors/spec/fixtures/modules/passwords/manifests/mirrors.pp
new file mode 100644
index 0000000..2f740b3
--- /dev/null
+++ b/modules/mirrors/spec/fixtures/modules/passwords/manifests/mirrors.pp
@@ -0,0 +1,3 @@
+class passwords::mirrors {
+ # nothing to see here
+}
--
To view, visit https://gerrit.wikimedia.org/r/394270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5503ef502bd6c16770f99e83f2da917e33b725ae
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
