Please review pull request #595: (#13380) cron acceptance tests break when no cron opened by (jeffweiss)
Description:
Add cron package resource to cron resource acceptance tests
- Opened: Sat Mar 24 04:20:33 UTC 2012
- Based on: puppetlabs:2.7.x (2b62839e54a815734db50f07ea902b367b306558)
- Requested merge: jeffweiss:ticket/2.7.x/13380_cron_acceptance_tests_break_when_no_cron (db17d7c2a4634e1c884b50f0526931a0b9ea5904)
Diff follows:
diff --git a/acceptance/tests/resource/cron/should_create_cron.rb b/acceptance/tests/resource/cron/should_create_cron.rb
index 0e48e46..6a1d5c0 100644
--- a/acceptance/tests/resource/cron/should_create_cron.rb
+++ b/acceptance/tests/resource/cron/should_create_cron.rb
@@ -6,6 +6,8 @@
create_user = "user { '#{tmpuser}': ensure => present, managehome => false }"
delete_user = "user { '#{tmpuser}': ensure => absent, managehome => false }"
+package_cron = "case $operatingsystem { centos, redhat: {$cron = 'cronie'}\n default: {$cron ='cron'} } package {'cron': name=> $cron, ensure=>present, }"
+
agents.each do |host|
if host['platform'].include?('windows')
skip_test "Test not supported on this platform"
@@ -14,6 +16,7 @@
step "ensure the user exist via puppet"
apply_manifest_on host, create_user
+ apply_manifest_on host, package_cron
step "apply the resource on the host using puppet resource"
on(host, puppet_resource("cron", "crontest", "user=#{tmpuser}",
diff --git a/acceptance/tests/resource/cron/should_match_existing.rb b/acceptance/tests/resource/cron/should_match_existing.rb
index d4af8a9..e6b5080 100755
--- a/acceptance/tests/resource/cron/should_match_existing.rb
+++ b/acceptance/tests/resource/cron/should_match_existing.rb
@@ -6,6 +6,8 @@
create_user = "user { '#{tmpuser}': ensure => present, managehome => false }"
delete_user = "user { '#{tmpuser}': ensure => absent, managehome => false }"
+package_cron = "case $operatingsystem { centos, redhat: {$cron = 'cronie'}\n default: {$cron ='cron'} } package {'cron': name=> $cron, ensure=>present, }"
+
agents.each do |host|
if host['platform'].include?('windows')
skip_test "Test not supported on this platform"
@@ -14,6 +16,7 @@
step "ensure the user exist via puppet"
apply_manifest_on host, create_user
+ apply_manifest_on host, package_cron
step "Create the existing cron job by hand..."
run_cron_on(host,:add,tmpuser,"* * * * * /bin/true")
diff --git a/acceptance/tests/resource/cron/should_remove_cron.rb b/acceptance/tests/resource/cron/should_remove_cron.rb
index 051a4fc..fa72f5a 100755
--- a/acceptance/tests/resource/cron/should_remove_cron.rb
+++ b/acceptance/tests/resource/cron/should_remove_cron.rb
@@ -6,6 +6,8 @@
create_user = "user { '#{tmpuser}': ensure => present, managehome => false }"
delete_user = "user { '#{tmpuser}': ensure => absent, managehome => false }"
+package_cron = "case $operatingsystem { centos, redhat: {$cron = 'cronie'}\n default: {$cron ='cron'} } package {'cron': name=> $cron, ensure=>present, }"
+
agents.each do |host|
if host['platform'].include?('windows')
skip_test "Test not supported on this platform"
@@ -14,6 +16,7 @@
step "ensure the user exist via puppet"
apply_manifest_on host, create_user
+ apply_manifest_on host, package_cron
step "create the existing job by hand..."
run_cron_on(host,:add,tmpuser,"* * * * * /bin/true")
diff --git a/acceptance/tests/resource/cron/should_remove_matching.rb b/acceptance/tests/resource/cron/should_remove_matching.rb
index 23dba7a..f480867 100755
--- a/acceptance/tests/resource/cron/should_remove_matching.rb
+++ b/acceptance/tests/resource/cron/should_remove_matching.rb
@@ -8,6 +8,8 @@
create_user = "user { '#{tmpuser}': ensure => present, managehome => false }"
delete_user = "user { '#{tmpuser}': ensure => absent, managehome => false }"
+package_cron = "case $operatingsystem { centos, redhat: {$cron = 'cronie'}\n default: {$cron ='cron'} } package {'cron': name=> $cron, ensure=>present, }"
+
agents.each do |host|
if host['platform'].include?('windows')
skip_test "Test not supported on this platform"
@@ -16,6 +18,7 @@
step "ensure the user exist via puppet"
apply_manifest_on host, create_user
+ apply_manifest_on host, package_cron
step "create the existing job by hand..."
run_cron_on(host,:add,tmpuser,"* * * * * /bin/true")
diff --git a/acceptance/tests/resource/cron/should_update_existing.rb b/acceptance/tests/resource/cron/should_update_existing.rb
index 1fa9cd9..1bd69b8 100755
--- a/acceptance/tests/resource/cron/should_update_existing.rb
+++ b/acceptance/tests/resource/cron/should_update_existing.rb
@@ -6,6 +6,8 @@
create_user = "user { '#{tmpuser}': ensure => present, managehome => false }"
delete_user = "user { '#{tmpuser}': ensure => absent, managehome => false }"
+package_cron = "case $operatingsystem { centos, redhat: {$cron = 'cronie'}\n default: {$cron ='cron'} } package {'cron': name=> $cron, ensure=>present, }"
+
agents.each do |host|
if host['platform'].include?('windows')
skip_test "Test not supported on this platform"
@@ -14,6 +16,7 @@
step "ensure the user exist via puppet"
apply_manifest_on host, create_user
+ apply_manifest_on host, package_cron
step "create the existing job by hand..."
run_cron_on(host,:add,tmpuser,"* * * * * /bin/true")
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
