Removing a test in the parser that is no longer necessary because of how imports work now, and fixing a snippet not to interfere with a local fact

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

2 files changed, 2 insertions, 17 deletions

diff --git a/examples/code/snippets/tagged.pp b/examples/code/snippets/tagged.pp
index 7d382d01c..e3ca93838 100644
--- a/examples/code/snippets/tagged.pp
+++ b/examples/code/snippets/tagged.pp
@@ -17,7 +17,7 @@ $yayness = tagged(yayness) ? {
     true => "true", false => "false"
 }
 
-$testing = tagged(testing) ? {
+$funtest = tagged(testing) ? {
     true => "true", false => "false"
 }
 
@@ -30,6 +30,6 @@ $bothtrue = tagged(testing, testing) ? {
 }
 
 file { "/tmp/taggedyayness$yayness": ensure => file }
-file { "/tmp/taggedtesting$testing": ensure => file }
+file { "/tmp/taggedtesting$funtest": ensure => file }
 file { "/tmp/taggedboth$both": ensure => file }
 file { "/tmp/taggedbothtrue$bothtrue": ensure => file }
diff --git a/test/language/parser.rb b/test/language/parser.rb
index e3d7bc5af..b92dc8dc7 100644
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -99,21 +99,6 @@ class TestParser < Test::Unit::TestCase
         }
     end
 
-    def test_nonexistent_import
-        basedir = File.join(tmpdir(), "importesting")
-        @@tmpfiles << basedir
-        Dir.mkdir(basedir)
-        manifest = File.join(basedir, "manifest")
-        File.open(manifest, "w") do |f|
-            f.puts "import \" no such file \""
-        end
-        assert_raise(Puppet::ParseError) {
-            parser = Puppet::Parser::Parser.new()
-            parser.file = manifest
-            parser.parse
-        }
-    end
-
     def test_defaults
         basedir = File.join(tmpdir(), "defaulttesting")
         @@tmpfiles << basedir