Fixing all broken tests. Most of them were broken by fileserving changes.

Signed-off-by: Luke Kanies <luke@madstop.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index babddec7d..8e55f104c 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -23,7 +23,7 @@ class TestMaster < Test::Unit::TestCase
 
     def test_freshness_is_always_now
         now1 = mock 'now1'
-        Time.expects(:now).returns(now1)
+        Time.stubs(:now).returns(now1)
 
         now1.expects(:to_i).returns 10
 
diff --git a/test/ral/type/user.rb b/test/ral/type/user.rb
index 02c25ae97..e2629f703 100755
--- a/test/ral/type/user.rb
+++ b/test/ral/type/user.rb
@@ -435,7 +435,7 @@ class TestUser < Test::Unit::TestCase
             user[:managehome] = false
         end
 
-        assert_raise(ArgumentError, "did not fail when managehome? is false") do
+        assert_raise(Puppet::Error, "did not fail when managehome? is false") do
             user[:managehome] = true
         end