Trivial mock cleanups

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2763 980ebf18-57e1-0310-9a29-db15c13687c0

test/certmgr/inventory.rb

@@ -52,8 +52,8 @@ class TestCertInventory < Test::Unit::TestCase
         cert = mksignedcert(ca, "host.domain.com")
 
         assert_nothing_raised do
-            file = nil
-            file.expects(:puts).times(1).with do |written|
+            file = mock()
+            file.expects(:puts).with do |written|
                 written.include? cert.subject.to_s
             end
             Puppet::Util::Config.any_instance.stubs(:write)

test/network/xmlrpc/processor.rb

@@ -64,8 +64,7 @@ class TestXMLRPCProcessor < Test::Unit::TestCase
         request.expects(:handler=).with("myhandler")
         request.expects(:method=).with("mymethod")
 
-        # I can't get this expectation to take with the argument, for some reason.
-        @processor.expects(:verify)
+        @processor.expects(:verify).times(2)
         @processor.expects(:handle).with(request.call,
             "params", request.name, request.ip)