diff --git a/test/ral/types/host.rb b/test/ral/types/host.rb
index 16ed20bd4..a5d645bd1 100755
--- a/test/ral/types/host.rb
+++ b/test/ral/types/host.rb
@@ -1,174 +1,181 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'test/unit'
 require 'facter'
 
 class TestHost < Test::Unit::TestCase
 	include PuppetTest
 
     def setup
         super
         @hosttype = Puppet::Type.type(:host)
 
         @provider = @hosttype.defaultprovider
 
         # Make sure they aren't using something funky like netinfo
         unless @provider.name == :parsed
             @hosttype.defaultprovider = @hosttype.provider(:parsed)
         end
 
         cleanup do @hosttype.defaultprovider = nil end
 
         if @provider.respond_to?(:default_target=)
             @default_file = @provider.default_target
             cleanup do
                 @provider.default_target = @default_file
             end
             @target = tempfile()
             @provider.default_target = @target
         end
     end
 
     def mkhost
         if defined? @hcount
             @hcount += 1
         else
             @hcount = 1
         end
 
         @catalog ||= mk_catalog
 
         host = nil
         assert_nothing_raised {
             host = Puppet.type(:host).create(
                 :name => "fakehost%s" % @hcount,
                 :ip => "192.168.27.%s" % @hcount,
                 :alias => "alias%s" % @hcount,
                 :catalog => @catalog
             )
         }
 
         return host
     end
 
     def test_list
         assert_nothing_raised do
             @hosttype.defaultprovider.prefetch
         end
 
         count = 0
         @hosttype.each do |h|
             count += 1
         end
 
         assert_equal(0, count, "Found hosts in empty file somehow")
     end
 
     # Darwin will actually write to netinfo here.
     if Facter.value(:operatingsystem) != "Darwin" or Process.uid == 0
     def test_simplehost
         host = nil
         # We want to actually use the netinfo provider on darwin
         if Facter.value(:operatingsystem) == "Darwin"
             Puppet::Type.type(:host).defaultprovider = nil
         end
 
         assert_nothing_raised {
             host = Puppet.type(:host).create(
                 :name => "culain",
                 :ip => "192.168.0.3"
             )
         }
 
         current_values = nil
         assert_nothing_raised { current_values = host.retrieve }
         assert_events([:host_created], host)
 
         assert_nothing_raised { current_values = host.retrieve }
 
         assert_equal(:present, current_values[host.property(:ensure)])
 
         host[:ensure] = :absent
 
         assert_events([:host_removed], host)
 
         assert_nothing_raised { current_values = host.retrieve }
 
         assert_equal(:absent, current_values[host.property(:ensure)])
     end
 
     def test_moddinghost
         # We want to actually use the netinfo provider on darwin
         if Facter.value(:operatingsystem) == "Darwin"
             Puppet::Type.type(:host).defaultprovider = nil
         end
         host = mkhost()
         if Facter.value(:operatingsystem) == "Darwin"
             assert_equal(:netinfo, host[:provider], "Got incorrect provider")
         end
         cleanup do
             host[:ensure] = :absent
             assert_apply(host)
         end
 
         assert_events([:host_created], host)
 
         current_values = nil 
         assert_nothing_raised {
             current_values = host.retrieve
         }
 
         # This was a hard bug to track down.
         assert_instance_of(String, current_values[host.property(:ip)])
 
         host[:alias] = %w{madstop kirby yayness}
 
         assert_events([:host_changed], host)
 
         assert_nothing_raised {
             current_values = host.retrieve
         }
 
         assert_equal(%w{madstop kirby yayness}, 
                      current_values[host.property(:alias)])
         
         host[:ensure] = :absent
         assert_events([:host_removed], host)
     end
  
     def test_invalid_ipaddress
         host = mkhost()
 
         assert_raise(Puppet::Error) {
             host[:ip] = "abc.def.ghi.jkl"
         }
     end
 
+    def test_invalid_hostname
+        host = mkhost()
+
+        assert_raise(Puppet::Error) {
+            host[:name] = "!invalid.hostname.$$$"
+        }
     end
- 
+
+    end  
     def test_aliasisproperty
         assert_equal(:property, @hosttype.attrtype(:alias))
     end
 
     def test_multivalues
         host = mkhost
         assert_raise(Puppet::Error) {
             host[:alias] = "puppetmasterd yayness"
         }
     end
 
     def test_puppetalias
         host = mkhost()
 
         assert_nothing_raised {
             host[:alias] = "testing"
         }
 
         same = host.class["testing"]
         assert(same, "Could not retrieve by alias")
     end
 end