summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Partlow <jpartlow@glatisant.org>2014-09-25 16:12:01 -0700
committerJosh Partlow <jpartlow@glatisant.org>2014-09-25 16:12:01 -0700
commit6d0d748f9e2832266aa7b4a278660983cdebb89a (patch)
treeefb380a25e8fbfb98a6e60a6c0588c1fec16000d
parentef7ec95bd2b6e4bf478d15633d7347470e2e0644 (diff)
parentd1acd12e526a5224eb457e508203882131ff597b (diff)
downloadpuppet-6d0d748f9e2832266aa7b4a278660983cdebb89a.tar.gz
Merge pull request #3122 from hkenney/issue/stable/pup-3339_confine_failed_test_off_of_fedora_19
(PUP-3339) Confine failed test off of Fedora 19
-rw-r--r--acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb b/acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb
index ea5bef339..0b1160100 100644
--- a/acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb
+++ b/acceptance/tests/config/puppet_manages_own_configuration_in_robust_manner.rb
@@ -5,6 +5,8 @@
# expect that after correcting their actions, puppet will work correctly.
test_name "Puppet manages its own configuration in a robust manner"
+confine :except, :platform => 'fedora-19'
+
skip_test "JVM Puppet cannot change its user while running." if @options[:is_puppetserver]
# when owner/group works on windows for settings, this confine should be removed.