[MediaWiki-commits] [Gerrit] fix puppet unit test in elastic search - change (operations/puppet)

2016-06-20 Thread Gehel (Code Review) 
Gehel has submitted this change and it was merged.

Change subject: fix puppet unit test in elastic search
..


fix puppet unit test in elastic search

default values have changed in elastic search module but test was not updated

Change-Id: I78518f5e34e22d5974d0c9912a6c388d729305e2
---
M modules/elasticsearch/spec/defines/https_rspec.rb
1 file changed, 13 insertions(+), 13 deletions(-)

Approvals:
  Gehel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/elasticsearch/spec/defines/https_rspec.rb 
b/modules/elasticsearch/spec/defines/https_rspec.rb
index 49b94da..1d066e5 100644
--- a/modules/elasticsearch/spec/defines/https_rspec.rb
+++ b/modules/elasticsearch/spec/defines/https_rspec.rb
@@ -7,6 +7,19 @@
   } }
 
   context 'with default parameters' do
+it 'should ensure that certificates are present' do
+  should contain_file('/etc/nginx/ssl/cert.pem').with({ 'ensure' => 
'present' })
+  should contain_file('/etc/nginx/ssl/server.key').with({ 'ensure' => 
'present' })
+end
+
+it 'should ensure that nginx package is present' do
+  should contain_package('nginx-full').with({ 'ensure' => 'present' })
+end
+  end
+
+  context 'with ensure => absent' do
+let(:params) { { :ensure => 'absent' } }
+
 it 'should ensure that certificates are absent' do
   should contain_file('/etc/nginx/ssl/cert.pem').with({ 'ensure' => 
'absent' })
   should contain_file('/etc/nginx/ssl/server.key').with({ 'ensure' => 
'absent' })
@@ -14,19 +27,6 @@
 
 it 'should ensure that nginx package is absent' do
   should contain_package('nginx-full').with({ 'ensure' => 'absent' })
-end
-  end
-
-  context 'with ensure => present' do
-let(:params) { { :ensure => 'present' } }
-
-it 'should ensure that certificates are present' do
-  should contain_file('/etc/nginx/ssl/cert.pem').with({ 'ensure' => 
'present' })
-  should contain_file('/etc/nginx/ssl/server.key').with({ 'ensure' => 
'present' })
-end
-
-it 'should ensure that nginx package is installed' do
-  should contain_package('nginx-full').with({ 'ensure' => 'present' })
 end
   end
 

-- 
To view, visit https://gerrit.wikimedia.org/r/295127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I78518f5e34e22d5974d0c9912a6c388d729305e2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Maturain 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] fix puppet unit test in elastic search - change (operations/puppet)

2016-06-19 Thread Maturain (Code Review) 
Maturain has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295127

Change subject: fix puppet unit test in elastic search
..

fix puppet unit test in elastic search

default values have changed in elastic search module but test was not updated

 Change-Id: Icbfa32091e1f3dc653ffcd12bcd6def5755ef48f

Change-Id: I78518f5e34e22d5974d0c9912a6c388d729305e2
---
M modules/elasticsearch/spec/defines/https_rspec.rb
1 file changed, 13 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/295127/1

diff --git a/modules/elasticsearch/spec/defines/https_rspec.rb 
b/modules/elasticsearch/spec/defines/https_rspec.rb
index 49b94da..1d066e5 100644
--- a/modules/elasticsearch/spec/defines/https_rspec.rb
+++ b/modules/elasticsearch/spec/defines/https_rspec.rb
@@ -7,6 +7,19 @@
   } }
 
   context 'with default parameters' do
+it 'should ensure that certificates are present' do
+  should contain_file('/etc/nginx/ssl/cert.pem').with({ 'ensure' => 
'present' })
+  should contain_file('/etc/nginx/ssl/server.key').with({ 'ensure' => 
'present' })
+end
+
+it 'should ensure that nginx package is present' do
+  should contain_package('nginx-full').with({ 'ensure' => 'present' })
+end
+  end
+
+  context 'with ensure => absent' do
+let(:params) { { :ensure => 'absent' } }
+
 it 'should ensure that certificates are absent' do
   should contain_file('/etc/nginx/ssl/cert.pem').with({ 'ensure' => 
'absent' })
   should contain_file('/etc/nginx/ssl/server.key').with({ 'ensure' => 
'absent' })
@@ -14,19 +27,6 @@
 
 it 'should ensure that nginx package is absent' do
   should contain_package('nginx-full').with({ 'ensure' => 'absent' })
-end
-  end
-
-  context 'with ensure => present' do
-let(:params) { { :ensure => 'present' } }
-
-it 'should ensure that certificates are present' do
-  should contain_file('/etc/nginx/ssl/cert.pem').with({ 'ensure' => 
'present' })
-  should contain_file('/etc/nginx/ssl/server.key').with({ 'ensure' => 
'present' })
-end
-
-it 'should ensure that nginx package is installed' do
-  should contain_package('nginx-full').with({ 'ensure' => 'present' })
 end
   end
 

-- 
To view, visit https://gerrit.wikimedia.org/r/295127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78518f5e34e22d5974d0c9912a6c388d729305e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Maturain 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits