summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/executables/puppetd.rb1
-rwxr-xr-xtest/language/snippets.rb7
2 files changed, 7 insertions, 1 deletions
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb
index 68b9b5f08..90733ed19 100755
--- a/test/executables/puppetd.rb
+++ b/test/executables/puppetd.rb
@@ -25,6 +25,7 @@ class TestPuppetDExe < Test::Unit::TestCase
cmd = "puppetd"
cmd += " --verbose"
+ cmd += " --onetime"
#cmd += " --fqdn %s" % fqdn
cmd += " --port %s" % @@port
cmd += " --confdir %s" % Puppet[:puppetconf]
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index 413fd1035..0e217bbbe 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -442,10 +442,15 @@ class TestSnippets < Test::Unit::TestCase
Puppet::Type.eachtype { |type|
type.each { |obj|
- unless obj.name == "puppet[top]"
+ unless obj.name == "puppet[top]" or
+ obj.is_a?(Puppet.type(:schedule))
assert(obj.parent, "%s has no parent" % obj.name)
end
assert(obj.name)
+
+ if obj.is_a?(Puppet.type(:file))
+ @@tmpfiles << obj.name
+ end
}
}
assert_nothing_raised {