From d98ab112a6ed5cd84d4e8b2e9c349283923ecc29 Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Wed, 28 Jun 2006 18:51:11 +0000
Subject: Fixing zone tests

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1329 980ebf18-57e1-0310-9a29-db15c13687c0
---
 test/types/zone.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/types/zone.rb b/test/types/zone.rb
index 302e2bb05..4370c300d 100755
--- a/test/types/zone.rb
+++ b/test/types/zone.rb
@@ -339,7 +339,7 @@ end
         # Include a bunch of stuff so the zone isn't as large
         dirs = %w{/usr /sbin /lib /platform}
 
-        %w{/opt/csw /usr/local}.each do |dir|
+        %w{/opt/csw}.each do |dir|
             dirs << dir if FileTest.exists? dir
         end
         zone[:inherit] = dirs
@@ -371,7 +371,7 @@ end
         zone = mkzone("methodtesting")
         dirs = %w{/usr /sbin /lib /platform}
 
-        %w{/opt/csw /usr/local}.each do |dir|
+        %w{/opt/csw}.each do |dir|
             dirs << dir if FileTest.exists? dir
         end
         zone[:inherit] = dirs
@@ -383,6 +383,7 @@ end
             [:uninstall, :configured],
             [:unconfigure, :absent]
         ].each do |method, state|
+            Puppet.info "Testing %s" % method
             assert_nothing_raised {
                 zone.retrieve
             }
@@ -403,7 +404,7 @@ end
         # Include a bunch of stuff so the zone isn't as large
         dirs = %w{/usr /sbin /lib /platform}
 
-        %w{/opt/csw /usr/local}.each do |dir|
+        %w{/opt/csw}.each do |dir|
             dirs << dir if FileTest.exists? dir
         end
         zone[:inherit] = dirs
-- 
cgit