Andrew Bogott has submitted this change and it was merged.
Change subject: Catch the spec tests up to our customizations:
......................................................................
Catch the spec tests up to our customizations:
- Remove tests for file chmods
- Expect the default presence of rsync and lack of xinetd.
Change-Id: Ia15b08c41915ecdff4b9a9b80fcbd72d8f37faa2
---
M modules/rsync/spec/classes/server_spec.rb
M modules/rsync/spec/defines/server_module_spec.rb
2 files changed, 3 insertions(+), 7 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/rsync/spec/classes/server_spec.rb
b/modules/rsync/spec/classes/server_spec.rb
index a7b1105..051f6cd 100644
--- a/modules/rsync/spec/classes/server_spec.rb
+++ b/modules/rsync/spec/classes/server_spec.rb
@@ -7,9 +7,9 @@
describe 'when using default params' do
it {
- should contain_class('xinetd')
- should contain_xinetd__service('rsync').with({ 'bind' => '0.0.0.0' })
- should_not contain_service('rsync')
+ should_not contain_class('xinetd')
+ should_not contain_xinetd__service('rsync').with({ 'bind' => '0.0.0.0' })
+ should contain_service('rsync')
should_not contain_file('/etc/rsync-motd')
should contain_file(fragment_file).with_content(/^use chroot\s*=\s*yes$/)
should
contain_file(fragment_file).with_content(/^address\s*=\s*0.0.0.0$/)
diff --git a/modules/rsync/spec/defines/server_module_spec.rb
b/modules/rsync/spec/defines/server_module_spec.rb
index 6df8054..736420f 100644
--- a/modules/rsync/spec/defines/server_module_spec.rb
+++ b/modules/rsync/spec/defines/server_module_spec.rb
@@ -29,8 +29,6 @@
it { should contain_file(fragment_file).with_content(/^list\s*=\s*yes$/) }
it { should contain_file(fragment_file).with_content(/^uid\s*=\s*0$/) }
it { should contain_file(fragment_file).with_content(/^gid\s*=\s*0$/) }
- it { should contain_file(fragment_file).with_content(/^incoming
chmod\s*=\s*0644$/) }
- it { should contain_file(fragment_file).with_content(/^outgoing
chmod\s*=\s*0644$/) }
it { should contain_file(fragment_file).with_content(/^max
connections\s*=\s*0$/) }
it { should_not contain_file(fragment_file).with_content(/^lock
file\s*=.*$/) }
it { should_not contain_file(fragment_file).with_content(/^secrets
file\s*=.*$/) }
@@ -54,8 +52,6 @@
:list => 'no',
:uid => '4682',
:gid => '4682',
- :incoming_chmod => '0777',
- :outgoing_chmod => '0777',
:secrets_file => '/path/to/secrets',
:hosts_allow => ['localhost', '169.254.42.51'],
:hosts_deny => ['some-host.example.com', '10.0.0.128']
--
To view, visit https://gerrit.wikimedia.org/r/72124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia15b08c41915ecdff4b9a9b80fcbd72d8f37faa2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
