diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-24 23:17:57 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-24 23:17:57 -0600 |
| commit | 4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200 (patch) | |
| tree | 431872a6909aab930d4585d1b4b4d730f4bfb703 /test/network | |
| parent | 7eb09abebb91a567b081a651fce179acfadfb7c0 (diff) | |
| parent | b575d1585322709604f558742dfd6f5ce412b342 (diff) | |
| download | puppet-4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200.tar.gz puppet-4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200.tar.xz puppet-4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200.zip | |
Merge branch 'plugins_mount', fixing #891.
Conflicts:
CHANGELOG
Diffstat (limited to 'test/network')
| -rwxr-xr-x | test/network/client/master.rb | 1 | ||||
| -rwxr-xr-x | test/network/handler/fileserver.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/test/network/client/master.rb b/test/network/client/master.rb index a005dadc7..84cd9388c 100755 --- a/test/network/client/master.rb +++ b/test/network/client/master.rb @@ -179,6 +179,7 @@ end assert_equal(hostname, Facter.value(:hostname), "Lost value to hostname") + assert_equal("yayness", Facter.value(:myfact), "Did not get correct fact value") diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb index 3539169dc..962d35e65 100755 --- a/test/network/handler/fileserver.rb +++ b/test/network/handler/fileserver.rb @@ -1030,7 +1030,6 @@ allow * end conffile = tempfile - @@tmpfiles << conffile File.open(conffile, "w") { |f| f.puts "# a test config file" } |