puppet 0.18.4 → 0.22.4

data/test/language/snippets.rb

@@ -1,32 +1,25 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/env ruby
 
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
-require 'puppet/client'
-require 'puppet/server'
-require 'test/unit'
+require 'puppet/network/client'
+require 'puppet/network/handler'
 require 'puppettest'
 
-# so, what kind of things do we want to test?
-
-# we don't need to test function, since we're confident in the
-# library tests.  We do, however, need to test how things are actually
-# working in the language.
-
-# so really, we want to do things like test that our ast is correct
-# and test whether we've got things in the right scopes
-
 class TestSnippets < Test::Unit::TestCase
-	include TestPuppet
+	include PuppetTest
     include ObjectSpace
-    $snippetbase = File.join($puppetbase, "examples", "code", "snippets")
+
+    def self.snippetdir
+        PuppetTest.datadir "snippets"
+    end
+
+    def snippet(name)
+        File.join(self.class.snippetdir, name)
+    end
     
     def file2ast(file)
         parser = Puppet::Parser::Parser.new()
@@ -48,7 +41,7 @@ class TestSnippets < Test::Unit::TestCase
         args = {
             :Listen => false
         }
-        Puppet::Client.new(args)
+        Puppet::Network::Client.new(args)
     end
 
     def ast2scope(ast)
@@ -77,8 +70,8 @@ class TestSnippets < Test::Unit::TestCase
         objs = scope2objs(scope)
     end
 
-    def states(type)
-        states = type.validstates
+    def properties(type)
+        properties = type.validproperties
     end
 
     def metaparams(type)
@@ -92,7 +85,7 @@ class TestSnippets < Test::Unit::TestCase
 
     def params(type)
         params = []
-        type.parameters.each { |name,state|
+        type.parameters.each { |name,property|
             params.push name
         }
 
@@ -105,7 +98,7 @@ class TestSnippets < Test::Unit::TestCase
     end
 
     def randeach(type)
-        [:states, :metaparams, :params].collect { |thing|
+        [:properties, :metaparams, :params].collect { |thing|
             randthing(thing,type)
         }
     end
@@ -156,7 +149,7 @@ class TestSnippets < Test::Unit::TestCase
     def test_nothing
     end
 
-    def snippet_filecreate(trans)
+    def snippet_filecreate
         %w{a b c d}.each { |letter|
             file = "/tmp/create%stest" % letter
             Puppet.info "testing %s" % file
@@ -168,29 +161,16 @@ class TestSnippets < Test::Unit::TestCase
             file = "/tmp/create%stest" % letter
             assert(File.stat(file).mode & 007777 == 0755)
         }
-
-        assert_nothing_raised {
-            trans.rollback
-        }
-        %w{a b c d}.each { |letter|
-            file = "/tmp/create%stest" % letter
-            assert(! FileTest.exists?(file), "File %s still exists" % file)
-        }
     end
 
-    def snippet_simpledefaults(trans)
+    def snippet_simpledefaults
         file = "/tmp/defaulttest"
         @@tmpfiles << file
         assert(FileTest.exists?(file), "File %s does not exist" % file)
         assert(File.stat(file).mode & 007777 == 0755)
-
-        assert_nothing_raised {
-            trans.rollback
-        }
-        assert(! FileTest.exists?(file), "%s still exists" % file)
     end
 
-    def snippet_simpleselector(trans)
+    def snippet_simpleselector
         files = %w{a b c d}.collect { |letter|
             "/tmp/snippetselect%stest" % letter
         }
@@ -202,16 +182,9 @@ class TestSnippets < Test::Unit::TestCase
                 "File %s is the incorrect mode" % file)
             @@tmpfiles << file
         }
-
-        assert_nothing_raised {
-            trans.rollback
-        }
-        files.each { |file|
-            assert(! FileTest.exists?(file), "%s still exists" % file)
-        }
     end
 
-    def snippet_classpathtest(trans)
+    def snippet_classpathtest
         file = "/tmp/classtest"
         @@tmpfiles << file
 
@@ -224,18 +197,13 @@ class TestSnippets < Test::Unit::TestCase
 
         assert_nothing_raised {
             assert_equal(
-                "//testing/component[componentname]/file=/tmp/classtest",
+                "//testing/component[componentname]/File[/tmp/classtest]",
                 obj.path)
             #Puppet.err obj.path
         }
-
-        assert_nothing_raised {
-            trans.rollback
-        }
-        assert(! FileTest.exists?(file), "%s still exists" % file)
     end
 
-    def snippet_argumentdefaults(trans)
+    def snippet_argumentdefaults
         file1 = "/tmp/argumenttest1"
         file2 = "/tmp/argumenttest2"
         @@tmpfiles << file1
@@ -248,7 +216,7 @@ class TestSnippets < Test::Unit::TestCase
         assert(File.stat(file2).mode & 007777 == 0644)
     end
 
-    def snippet_casestatement(trans)
+    def snippet_casestatement
         files = %w{
             /tmp/existsfile
             /tmp/existsfile2
@@ -261,13 +229,9 @@ class TestSnippets < Test::Unit::TestCase
             assert(FileTest.exists?(file), "File %s is missing" % file)
             assert(File.stat(file).mode & 007777 == 0755, "File %s is not 755" % file)
         }
-
-        assert_nothing_raised {
-            trans.rollback
-        }
     end
 
-    def snippet_implicititeration(trans)
+    def snippet_implicititeration
         files = %w{a b c d e f g h}.collect { |l| "/tmp/iteration%stest" % l }
 
         files.each { |file|
@@ -277,17 +241,9 @@ class TestSnippets < Test::Unit::TestCase
                 "File %s is not 755" % file)
 
         }
-
-        assert_nothing_raised {
-            trans.rollback
-        }
-
-        files.each { |file|
-            assert(! FileTest.exists?(file), "file %s still exists" % file)
-        }
     end
 
-    def snippet_multipleinstances(trans)
+    def snippet_multipleinstances
         files = %w{a b c}.collect { |l| "/tmp/multipleinstances%s" % l }
 
         files.each { |file|
@@ -297,17 +253,9 @@ class TestSnippets < Test::Unit::TestCase
                 "File %s is not 755" % file)
 
         }
-
-        assert_nothing_raised {
-            trans.rollback
-        }
-
-        files.each { |file|
-            assert(! FileTest.exists?(file), "file %s still exists" % file)
-        }
     end
 
-    def snippet_namevartest(trans)
+    def snippet_namevartest
         file = "/tmp/testfiletest"
         dir = "/tmp/testdirtest"
         @@tmpfiles << file
@@ -316,7 +264,7 @@ class TestSnippets < Test::Unit::TestCase
         assert(FileTest.directory?(dir), "Directory %s does not exist" % dir)
     end
 
-    def snippet_scopetest(trans)
+    def snippet_scopetest
         file = "/tmp/scopetest"
         @@tmpfiles << file
         assert(FileTest.file?(file), "File %s does not exist" % file)
@@ -324,7 +272,7 @@ class TestSnippets < Test::Unit::TestCase
             "File %s is not 755" % file)
     end
 
-    def snippet_failmissingexecpath(trans)
+    def snippet_failmissingexecpath
         file = "/tmp/exectesting1"
         execfile = "/tmp/execdisttesting"
         @@tmpfiles << file
@@ -332,7 +280,7 @@ class TestSnippets < Test::Unit::TestCase
         assert(!FileTest.exists?(execfile), "File %s exists" % execfile)
     end
 
-    def snippet_selectorvalues(trans)
+    def snippet_selectorvalues
         nums = %w{1 2 3 4 5}
         files = nums.collect { |n|
             "/tmp/selectorvalues%s" % n
@@ -346,7 +294,7 @@ class TestSnippets < Test::Unit::TestCase
         }
     end
 
-    def snippet_singleselector(trans)
+    def snippet_singleselector
         nums = %w{1 2 3}
         files = nums.collect { |n|
             "/tmp/singleselector%s" % n
@@ -360,13 +308,13 @@ class TestSnippets < Test::Unit::TestCase
         }
     end
 
-    def snippet_falsevalues(trans)
+    def snippet_falsevalues
         file = "/tmp/falsevaluesfalse"
         @@tmpfiles << file
         assert(FileTest.exists?(file), "File %s does not exist" % file)
     end
 
-    def disabled_snippet_classargtest(trans)
+    def disabled_snippet_classargtest
         [1,2].each { |num|
             file = "/tmp/classargtest%s" % num
             @@tmpfiles << file
@@ -376,7 +324,7 @@ class TestSnippets < Test::Unit::TestCase
         }
     end
 
-    def snippet_classheirarchy(trans)
+    def snippet_classheirarchy
         [1,2,3].each { |num|
             file = "/tmp/classheir%s" % num
             @@tmpfiles << file
@@ -386,7 +334,7 @@ class TestSnippets < Test::Unit::TestCase
         }
     end
 
-    def snippet_singleary(trans)
+    def snippet_singleary
         [1,2,3,4].each { |num|
             file = "/tmp/singleary%s" % num
             @@tmpfiles << file
@@ -394,7 +342,7 @@ class TestSnippets < Test::Unit::TestCase
         }
     end
 
-    def snippet_classincludes(trans)
+    def snippet_classincludes
         [1,2,3].each { |num|
             file = "/tmp/classincludes%s" % num
             @@tmpfiles << file
@@ -404,19 +352,19 @@ class TestSnippets < Test::Unit::TestCase
         }
     end
 
-    def snippet_componentmetaparams(trans)
+    def snippet_componentmetaparams
         ["/tmp/component1", "/tmp/component2"].each { |file|
             assert(FileTest.file?(file), "File %s does not exist" % file)
         }
     end
 
-    def snippet_aliastest(trans)
+    def snippet_aliastest
         %w{/tmp/aliastest /tmp/aliastest2 /tmp/aliastest3}.each { |file|
             assert(FileTest.file?(file), "File %s does not exist" % file)
         }
     end
 
-    def snippet_singlequote(trans)
+    def snippet_singlequote
         {   1 => 'a $quote',
             2 => 'some "\yayness\"'
         }.each { |count, str|
@@ -430,12 +378,12 @@ class TestSnippets < Test::Unit::TestCase
 
     # There's no way to actually retrieve the list of classes from the
     # transaction.
-    def snippet_tag(trans)
+    def snippet_tag
         @@tmpfiles << "/tmp/settestingness"
     end
 
     # Make sure that set tags are correctly in place, yo.
-    def snippet_tagged(trans)
+    def snippet_tagged
         tags = {"testing" => true, "yayness" => false,
             "both" => false, "bothtrue" => true, "define" => true}
 
@@ -448,13 +396,13 @@ class TestSnippets < Test::Unit::TestCase
         end
     end
 
-    def snippet_defineoverrides(trans)
+    def snippet_defineoverrides
         file = "/tmp/defineoverrides1"
         assert(FileTest.exists?(file), "File does not exist")
         assert_equal(0755, filemode(file))
     end
 
-    def snippet_deepclassheirarchy(trans)
+    def snippet_deepclassheirarchy
         5.times { |i|
             i += 1
             file = "/tmp/deepclassheir%s" % i
@@ -462,18 +410,63 @@ class TestSnippets < Test::Unit::TestCase
         }
     end
 
-    def snippet_emptyclass(trans)
+    def snippet_emptyclass
         # There's nothing to check other than that it works
     end
 
-    def snippet_emptyexec(trans)
+    def snippet_emptyexec
         assert(FileTest.exists?("/tmp/emptyexectest"),
             "Empty exec was ignored")
 
         @@tmpfiles << "/tmp/emptyexextest"
     end
 
-    def disabled_snippet_dirchmod(trans)
+    def snippet_multisubs
+        path = "/tmp/multisubtest"
+        assert(FileTest.exists?(path), "Did not create file")
+        assert_equal("sub2", File.read(path), "sub2 did not override content")
+        assert_equal(0755, filemode(path), "sub1 did not override mode")
+    end
+
+    def snippet_collection
+        assert(FileTest.exists?("/tmp/colltest1"), "Did not collect file")
+        assert(! FileTest.exists?("/tmp/colltest2"), "Incorrectly collected file")
+    end
+
+    def snippet_virtualresources
+        %w{1 2 3 4}.each do |num|
+            assert(FileTest.exists?("/tmp/virtualtest#{num}"),
+                "Did not collect file #{num}")
+        end
+    end
+    
+    def snippet_componentrequire
+        %w{1 2}.each do |num|
+            assert(FileTest.exists?("/tmp/testing_component_requires#{num}"),
+                "#{num} does not exist")
+            end
+    end
+
+    def snippet_realize_defined_types
+        assert(FileTest.exists?("/tmp/realize_defined_test1"),
+            "Did not make file from realized defined type")
+        assert(FileTest.exists?("/tmp/realize_defined_test2"),
+            "Did not make file from realized file inside defined type")
+    end
+
+    def snippet_fqparents
+        assert(FileTest.exists?("/tmp/fqparent1"),
+            "Did not make file from parent class")
+        assert(FileTest.exists?("/tmp/fqparent2"),
+            "Did not make file from subclass")
+    end
+
+    def snippet_fqdefinition
+        assert(FileTest.exists?("/tmp/fqdefinition"),
+            "Did not make file from fully-qualified definition")
+    end
+
+    def snippet_dirchmod
         dirs = %w{a b}.collect { |letter|
             "/tmp/dirchmodtest%s" % letter
         }
@@ -486,14 +479,10 @@ class TestSnippets < Test::Unit::TestCase
 
         assert(File.stat("/tmp/dirchmodtesta").mode & 007777 == 0755)
         assert(File.stat("/tmp/dirchmodtestb").mode & 007777 == 0700)
-
-        assert_nothing_raised {
-            trans.rollback
-        }
     end
 
-    # XXX this is the answer
-    Dir.entries($snippetbase).sort.each { |file|
+    # Iterate across each of the snippets and create a test.
+    Dir.entries(snippetdir).sort.each { |file|
         next if file =~ /^\./
 
 
@@ -503,11 +492,11 @@ class TestSnippets < Test::Unit::TestCase
             testname = ("test_" + mname).intern
             self.send(:define_method, testname) {
                 # first parse the file
-                server = Puppet::Server::Master.new(
-                    :Manifest => File.join($snippetbase, file),
+                server = Puppet::Network::Handler.master.new(
+                    :Manifest => snippet(file),
                     :Local => true
                 )
-                client = Puppet::Client::MasterClient.new(
+                client = Puppet::Network::Client.master.new(
                     :Master => server,
                     :Cache => false
                 )
@@ -517,7 +506,7 @@ class TestSnippets < Test::Unit::TestCase
                     client.getconfig()
                 }
 
-                client = Puppet::Client::MasterClient.new(
+                client = Puppet::Network::Client.master.new(
                     :Master => server,
                     :Cache => false
                 )
@@ -528,7 +517,6 @@ class TestSnippets < Test::Unit::TestCase
                 assert_nothing_raised {
                     client.getconfig()
                 }
-                trans = nil
                 assert_nothing_raised {
                     trans = client.apply()
                 }
@@ -548,7 +536,7 @@ class TestSnippets < Test::Unit::TestCase
                     }
                 }
                 assert_nothing_raised {
-                    self.send(mname, trans)
+                    self.send(mname)
                 }
 
                 client.clear
@@ -557,3 +545,5 @@ class TestSnippets < Test::Unit::TestCase
         end
     }
 end
+
+# $Id: snippets.rb 2259 2007-03-06 19:03:05Z luke $