Merge pull request #130 from danieldreier/more_testing

Improve tests for puppet::agent

Author: zachfi

spec/acceptance/agent_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'agent', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'with default parameters' do
+  context 'with default parameters', :agent_method => 'default' do
     it 'should run with no errors', :agent do
       pp = <<-EOS
       class { 'puppet::agent': }
@@ -13,26 +13,49 @@ class { 'puppet::agent': }
     end
   end
 
-#  context 'running as service' do
-#    it 'should run with no errors' do
-#      pp = <<-EOS
-#      class { 'puppet::agent':
-#       method        => 'service',
-#      }
-#      EOS
-
-#      # Run it twice and test for idempotency
-#      apply_manifest(pp, :catch_failures => true)
-#      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-#    end
-#
-#    describe service('puppet') do
-#      it {
-#        should be_enabled
-#      }
-#      it {
-#        should be_running
-#      }
-#    end
-#  end
+  context 'running as cron', :agent_method => 'cron'  do
+    it 'should run with no errors' do
+      pp = <<-EOS
+      class { 'puppet::agent':
+        method => 'cron',
+      }
+      EOS
+
+      # Run it twice and test for idempotency
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+    end
+
+    describe service('puppet') do
+      it {
+        should be_disabled
+      }
+      it {
+        should_not be_running
+      }
+    end
+  end
+  context 'running as service', :agenttype => 'service'  do
+    it 'should run with no errors' do
+      pp = <<-EOS
+      class { 'puppet::agent':
+        method => 'service',
+      }
+      EOS
+
+      # Run it twice and test for idempotency
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+    end
+
+    describe service('puppet') do
+      it {
+        should be_enabled
+      }
+      it {
+        should be_running
+      }
+    end
+  end
+
 end

spec/classes/agent_spec.rb

@@ -1,5 +1,15 @@
 require 'spec_helper'
 
+shared_examples 'agent examples' do
+  it { should contain_class('puppet::package') }
+  it { should contain_class('puppet::agent') }
+  it { should compile.with_all_deps }
+  it { should contain_ini_setting('report_server').with_value('puppet_reports.example.com') }
+  it { should contain_ini_setting('server').with_value('puppet.example.com') }
+  it { should contain_ini_setting('pluginsync').with_value(true) }
+  it { should contain_package('puppet') }
+end
+
 describe 'puppet::agent' do
   describe "sample agent configuration from documentation" do
     let(:params) {{
@@ -19,21 +29,77 @@
           :lsbdistid       => operatingsystem,
           :lsbdistcodename => 'lolwut'
         }}
-
-        it { should contain_class('puppet::package') }
-        it { should contain_class('puppet::agent') }
-
-        it { should compile.with_all_deps }
-        it { should contain_ini_setting('report_server').with_value('puppet_reports.example.com') }
-        it { should contain_ini_setting('server').with_value('puppet.example.com') }
-        it { should contain_ini_setting('pluginsync').with_value(true) }
-
-        it { should contain_package('puppet') }
-        it do
-          should contain_service('puppet_agent').with({
-            :ensure => "running"
-          })
+        context 'running as service' do
+          let(:params) {{
+            :server        => 'puppet.example.com',
+            :report_server => 'puppet_reports.example.com',
+            :method        => 'service',
+          }}
+          it_behaves_like "agent examples"
+          it do
+            should contain_service('puppet_agent').with({
+              :ensure => "running"
+            })
+            should contain_cron('puppet agent')
+          end
         end
+        context 'method => "only_service"' do
+          let(:params) {{
+            :server        => 'puppet.example.com',
+            :report_server => 'puppet_reports.example.com',
+            :method        => 'only_service',
+          }}
+          it_behaves_like "agent examples"
+          it do
+            should contain_service('puppet_agent').with({
+              :ensure => "running"
+            })
+            should_not contain_cron('puppet agent')
+          end
+        end
+        context 'method => "none"' do
+          let(:params) {{
+            :server        => 'puppet.example.com',
+            :report_server => 'puppet_reports.example.com',
+            :method        => 'only_service',
+          }}
+          it_behaves_like "agent examples"
+          it do
+            should contain_service('puppet_agent').with({
+              :ensure => "running"
+            })
+            should_not contain_cron('puppet agent')
+          end
+        end
+        context 'method => "cron"' do
+          let(:params) {{
+            :server        => 'puppet.example.com',
+            :report_server => 'puppet_reports.example.com',
+            :method        => 'cron',
+          }}
+          it_behaves_like "agent examples"
+          it do
+            should_not contain_service('puppet_agent').with({
+              :ensure => "running"
+            })
+            should contain_cron('puppet agent').with_command(/puppet agent/)
+          end
+        end
+        context 'manage_repos => false' do
+          let(:params) {{
+            :server        => 'puppet.example.com',
+            :report_server => 'puppet_reports.example.com',
+            :manage_repos  => false,
+          }}
+          it_behaves_like "agent examples"
+          it do
+            should contain_service('puppet_agent')
+            should contain_cron('puppet agent').with_command(/puppet agent/)
+            should_not contain_yumrepo('puppetlabs-products')
+            should_not contain_apt__source('puppetlabs')
+          end
+        end
+
       end
     end
   end

tests/agent_cron.pp

@@ -0,0 +1,3 @@
+class { 'puppet::agent':
+  method => 'cron',
+}

tests/agent_noapt.pp

@@ -0,0 +1,4 @@
+class { 'puppet::agent':
+  method       => 'cron',
+  manage_repos => false,
+}