Merge "Bump Puppet version 4.x to 5.x"

[integration/packaging/puppet-opendaylight.git] / spec / classes / opendaylight_spec.rb

diff --git a/spec/classes/opendaylight_spec.rb b/spec/classes/opendaylight_spec.rb
index 506c314fd3112cf78f2db0d81fa47111ed24f06d..c430a55f9fa1a60e20bfcc3602c98940f250adda 100644 (file)
--- a/spec/classes/opendaylight_spec.rb
+++ b/spec/classes/opendaylight_spec.rb
@@ -479,7 +479,7 @@ describe 'opendaylight' do
       }}
 
       let(:params) {{
-        :log_max_size => '1GB',
+        :log_max_size => '100MB',
       }}
 
       # Run shared tests applicable to all supported OSs
@@ -487,7 +487,7 @@ describe 'opendaylight' do
       generic_tests
 
       # Run test specific to log settings
-      log_settings(log_max_size: '1GB')
+      log_settings(log_max_size: '100MB')
     end
 
     context 'log to file customizing rollover' do
@@ -498,7 +498,7 @@ describe 'opendaylight' do
       }}
 
       let(:params) {{
-        :log_max_rollover => 3,
+        :log_max_rollover => 10,
       }}
 
       # Run shared tests applicable to all supported OSs
@@ -506,7 +506,7 @@ describe 'opendaylight' do
       generic_tests
 
       # Run test specific to log settings
-      log_settings(log_max_rollover: 3)
+      log_settings(log_max_rollover: 10)
     end
 
     context 'log to file customizing size and rollover' do
@@ -517,8 +517,8 @@ describe 'opendaylight' do
       }}
 
       let(:params) {{
-        :log_max_size => '1GB',
-        :log_max_rollover => 3,
+        :log_max_size => '250MB',
+        :log_max_rollover => 8,
         :log_rollover_fileindex => 'min'
       }}
 
@@ -527,8 +527,8 @@ describe 'opendaylight' do
       generic_tests
 
       # Run test specific to log settings
-      log_settings(log_max_size: '1GB',
-                   log_max_rollover: 3,
+      log_settings(log_max_size: '250MB',
+                   log_max_rollover: 8,
                    log_rollover_fileindex: 'min')
     end
 
@@ -551,6 +551,44 @@ describe 'opendaylight' do
       log_settings(log_pattern: '%d{ISO8601} | %-5p | %-16t | %m%n')
     end
 
+    context 'log to file enabling the PaxOsgi appender' do
+      let(:facts) {{
+        :osfamily => osfamily,
+        :operatingsystem => operatingsystem,
+        :operatingsystemmajrelease => operatingsystemmajrelease,
+      }}
+
+      let(:params) {{
+        :enable_paxosgi_logger => true,
+      }}
+
+      # Run shared tests applicable to all supported OSs
+      # Note that this function is defined in spec_helper
+      generic_tests
+
+      # Run test specific to log settings
+      log_settings(enable_paxosgi_logger: true)
+    end
+
+    context 'log to file disabling the PaxOsgi appender' do
+      let(:facts) {{
+        :osfamily => osfamily,
+        :operatingsystem => operatingsystem,
+        :operatingsystemmajrelease => operatingsystemmajrelease,
+      }}
+
+      let(:params) {{
+        :enable_paxosgi_logger => false,
+      }}
+
+      # Run shared tests applicable to all supported OSs
+      # Note that this function is defined in spec_helper
+      generic_tests
+
+      # Run test specific to log settings
+      log_settings(enable_paxosgi_logger: false)
+    end
+
     context 'log to console' do
       let(:facts) {{
         :osfamily => osfamily,
@@ -591,6 +629,48 @@ describe 'opendaylight' do
                    log_pattern: '%d{ISO8601} | %-5p | %-16t | %m%n')
     end
 
+    context 'log to console enabling the PaxOsgi appender' do
+      let(:facts) {{
+        :osfamily => osfamily,
+        :operatingsystem => operatingsystem,
+        :operatingsystemmajrelease => operatingsystemmajrelease,
+      }}
+
+      let(:params) {{
+        :log_mechanism => 'console',
+        :enable_paxosgi_logger => true,
+      }}
+
+      # Run shared tests applicable to all supported OSs
+      # Note that this function is defined in spec_helper
+      generic_tests
+
+      # Run test specific to log settings
+      log_settings(log_mechanism: 'console',
+                   enable_paxosgi_logger: true)
+    end
+
+    context 'log to console disabling the PaxOsgi appender' do
+      let(:facts) {{
+        :osfamily => osfamily,
+        :operatingsystem => operatingsystem,
+        :operatingsystemmajrelease => operatingsystemmajrelease,
+      }}
+
+      let(:params) {{
+        :log_mechanism => 'console',
+        :enable_paxosgi_logger => false,
+      }}
+
+      # Run shared tests applicable to all supported OSs
+      # Note that this function is defined in spec_helper
+      generic_tests
+
+      # Run test specific to log settings
+      log_settings(log_mechanism: 'console',
+                   enable_paxosgi_logger: false)
+    end
+
     context 'setting inactivity probe' do
       let(:facts) {{
         :osfamily => osfamily,