diff options
| author | Rick Bradley <rick@rickbradley.com> | 2007-10-09 11:29:13 -0500 |
|---|---|---|
| committer | Rick Bradley <rick@rickbradley.com> | 2007-10-09 11:29:13 -0500 |
| commit | fdfe807bd986a2b27f0dfd0cecde1a33aeee309b (patch) | |
| tree | 0b6375bdefa041a7d4fbab9745ed084fb025bc30 /test/network/client/master.rb | |
| parent | 42b98562b5237797e1a51fdcdd57aa3c6825b404 (diff) | |
| parent | 01f132d8b88467dfd314ad355f1cdf9f546945b3 (diff) | |
| download | puppet-fdfe807bd986a2b27f0dfd0cecde1a33aeee309b.tar.gz puppet-fdfe807bd986a2b27f0dfd0cecde1a33aeee309b.tar.xz puppet-fdfe807bd986a2b27f0dfd0cecde1a33aeee309b.zip | |
Merge branch 'master' of git://reductivelabs.com/puppet into routing
Diffstat (limited to 'test/network/client/master.rb')
| -rwxr-xr-x | test/network/client/master.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/network/client/master.rb b/test/network/client/master.rb index aaa38b223..4ae77abc2 100755 --- a/test/network/client/master.rb +++ b/test/network/client/master.rb @@ -397,6 +397,8 @@ end manifest = tempfile() File.open(manifest, "w") { |f| f.puts "file { '#{file}': content => yay }" } + Puppet::Node::Facts.indirection.stubs(:save) + driver = mkmaster(:Manifest => manifest) driver.local = false master = mkclient(driver) @@ -406,7 +408,7 @@ end assert(! master.fresh?(master.class.facts), "Considered fresh with no compile at all") - + assert_nothing_raised { master.run } assert(master.fresh?(master.class.facts), "not considered fresh after compile") @@ -481,7 +483,9 @@ end master.local = false driver = master.send(:instance_variable_get, "@driver") driver.local = false + Puppet::Node::Facts.indirection.stubs(:save) # Retrieve the configuration + master.getconfig # Now the config is up to date, so get rid of the @objects var and @@ -509,6 +513,8 @@ end driver = master.send(:instance_variable_get, "@driver") driver.local = false + Puppet::Node::Facts.indirection.stubs(:save) + assert_nothing_raised("Could not compile config") do master.getconfig end |
