summaryrefslogtreecommitdiffstats
path: root/test/language
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-04 23:13:55 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-04 23:13:55 +0000
commite8c04716b2e3ef348848d85ed88c886bd43d95df (patch)
treef2b813830ba9e43d2a63f95110b0aa72d6809c0f /test/language
parent92302895549800d9d8384b2cc77f9b5bb4dc1fd1 (diff)
downloadpuppet-e8c04716b2e3ef348848d85ed88c886bd43d95df.tar.gz
puppet-e8c04716b2e3ef348848d85ed88c886bd43d95df.tar.xz
puppet-e8c04716b2e3ef348848d85ed88c886bd43d95df.zip
Fixing a couple of bugs in preparation for 0.15.2; mostly they were in the testing system and resulted from changing :File to :Manifest in server/master
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1068 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/language')
-rwxr-xr-xtest/language/snippets.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index a4090e7d2..220c50511 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -448,7 +448,7 @@ class TestSnippets < Test::Unit::TestCase
self.send(:define_method, testname) {
# first parse the file
server = Puppet::Server::Master.new(
- :File => File.join($snippetbase, file),
+ :Manifest => File.join($snippetbase, file),
:Local => true
)
client = Puppet::Client::MasterClient.new(