diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-29 14:33:49 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-29 14:33:49 -0800 |
| commit | cb6e9c990945501962bf9bf864309e8e6f83b827 (patch) | |
| tree | 7109f1605e4dceca9e48ef58b41bda559ba4901d /test/network/handler | |
| parent | 52f9ef06507d87026936dc90dcb467a728ebd54f (diff) | |
| parent | 71ecad9904c8c48c023e90e5fbea5b26b180c9cf (diff) | |
Merge branch 'maint/next/remove_indirection_delegation' into next
* maint/next/remove_indirection_delegation:
Maint: Refactor code to use <class>.indirection.<method>
Maint: Refactor tests to use <class>.indirection.<method>
Diffstat (limited to 'test/network/handler')
| -rwxr-xr-x | test/network/handler/master.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb index 81869ac06..018f6904b 100755 --- a/test/network/handler/master.rb +++ b/test/network/handler/master.rb @@ -13,7 +13,7 @@ class TestMaster < Test::Unit::TestCase @master = Puppet::Network::Handler.master.new(:Manifest => tempfile) @catalog = stub 'catalog', :extract => "" - Puppet::Resource::Catalog.stubs(:find).returns(@catalog) + Puppet::Resource::Catalog.indirection.stubs(:find).returns(@catalog) end def teardown @@ -53,7 +53,7 @@ class TestMaster < Test::Unit::TestCase @master.stubs(:decode_facts) - Puppet::Resource::Catalog.expects(:find).with("foo.com").returns(@catalog) + Puppet::Resource::Catalog.indirection.expects(:find).with("foo.com").returns(@catalog) @master.getconfig("facts", "yaml", "foo.com") end @@ -68,7 +68,7 @@ class TestMasterFormats < Test::Unit::TestCase @master.stubs(:decode_facts) @catalog = stub 'catalog', :extract => "" - Puppet::Resource::Catalog.stubs(:find).returns(@catalog) + Puppet::Resource::Catalog.indirection.stubs(:find).returns(@catalog) end def test_marshal_can_be_used |