puppet 0.23.2 → 0.24.0

data/test/ral/types/group.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'etc'
@@ -65,7 +65,7 @@ class TestGroup < Test::Unit::TestCase
     def attrtest_ensure(group)
         group[:ensure] = :absent
 
-        comp = newcomp("ensuretest", group)
+        comp = mk_catalog("ensuretest", group)
         assert_apply(comp)
         assert_equal(:absent, group.provider.ensure,  "Group is still present")
         group[:ensure] = :present
@@ -91,7 +91,7 @@ class TestGroup < Test::Unit::TestCase
         assert_equal(15, group.should(:gid),
                      "Did not convert gid to number")
 
-        comp = newcomp(group)
+        comp = mk_catalog(group)
         trans = assert_events([:group_modified], comp, "group")
         assert_equal(15, group.provider.gid, "GID was not changed")
 

data/test/ral/types/host.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'test/unit'
@@ -38,12 +38,16 @@ class TestHost < Test::Unit::TestCase
         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
+                :alias => "alias%s" % @hcount,
+                :catalog => @catalog
             )
         }
 
@@ -159,4 +163,3 @@ class TestHost < Test::Unit::TestCase
     end
 end
 
-# $Id: host.rb 2487 2007-05-09 01:51:20Z ballman $

data/test/ral/types/mailalias.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
@@ -47,4 +47,3 @@ class TestMailAlias < Test::Unit::TestCase
     end
 end
 
-# $Id: mailalias.rb 2676 2007-07-10 23:24:34Z luke $

data/test/ral/types/parameter.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 
@@ -113,6 +113,9 @@ class TestParameter < Test::Unit::TestCase
 
         inst = type.create(:name => "test")
 
+        config = mk_catalog
+        inst.catalog = config
+
         assert_nothing_raised("Could not create shadowed param") {
             inst[:alias] = "foo"
         }
@@ -133,7 +136,7 @@ class TestParameter < Test::Unit::TestCase
         # Now try it during initialization
         other = nil
         assert_nothing_raised("Could not create instance with shadow") do
-            other = type.create(:name => "rah", :alias => "one")
+            other = type.create(:name => "rah", :alias => "one", :catalog => config)
         end
         params = other.instance_variable_get("@parameters")
         obj = params[:alias]
@@ -169,4 +172,3 @@ class TestParameter < Test::Unit::TestCase
     end
 end
 
-# $Id: parameter.rb 2647 2007-07-04 22:25:23Z luke $

data/test/ral/types/port.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 
@@ -145,4 +145,3 @@ require 'puppettest'
 #    end
 #end
 
-# $Id: port.rb 2170 2007-02-07 17:21:52Z luke $

data/test/ral/types/property.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 
@@ -76,7 +76,8 @@ class TestProperty < Test::Unit::TestCase
             end
             assert_equal(/\d+/, name)
         end
-        ["two", :three].each do |value|
+        # these values should not have a name
+        ["two", :three, ''].each do |value|
             assert_nothing_raised do
                 name = property.value_name(value)
             end
@@ -385,4 +386,3 @@ class TestProperty < Test::Unit::TestCase
     end
 end
 
-# $Id: property.rb 2674 2007-07-10 19:30:39Z luke $

data/test/ral/types/resources.rb

@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-12-12.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 
@@ -206,4 +206,3 @@ class TestResources < Test::Unit::TestCase
     end
 end
 
-# $Id: resources.rb 2551 2007-06-04 20:37:14Z luke $

data/test/ral/types/service.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
@@ -10,9 +10,12 @@ class TestServiceType < Test::Unit::TestCase
 
     # #199
     def test_no_refresh_when_starting
-        service = Puppet::Type.type(:service).create :name => "testing",
+        service = Puppet::Type.type(:service).create :name => "hopefully_this_isnt_in_the_process_table",
             :ensure => :running, :provider => :base
 
+        assert_equal :running, service.instance_eval('@parameters[:ensure]').should
+        assert_not_equal :running, service.instance_eval('@parameters[:ensure]').retrieve, "You have something called #{service.name} in your process table"
+
         # First make sure it does not refresh
         service.provider.expects(:restart).never
 
@@ -33,4 +36,3 @@ class TestServiceType < Test::Unit::TestCase
     end
 end
 
-# $Id: service.rb 2487 2007-05-09 01:51:20Z ballman $

data/test/ral/types/sshkey.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/type/sshkey'
@@ -47,12 +47,15 @@ class TestSSHKey < Test::Unit::TestCase
             @kcount = 1
         end
 
+        @catalog ||= mk_catalog
+
         assert_nothing_raised {
             key = @sshkeytype.create(
                 :name => "host%s.madstop.com" % @kcount,
                 :key => "%sAAAAB3NzaC1kc3MAAACBAMnhSiku76y3EGkNCDsUlvpO8tRgS9wL4Eh54WZfQ2lkxqfd2uT/RTT9igJYDtm/+UHuBRdNGpJYW1Nw2i2JUQgQEEuitx4QKALJrBotejGOAWxxVk6xsh9xA0OW8Q3ZfuX2DDitfeC8ZTCl4xodUMD8feLtP+zEf8hxaNamLlt/AAAAFQDYJyf3vMCWRLjTWnlxLtOyj/bFpwAAAIEAmRxxXb4jjbbui9GYlZAHK00689DZuX0EabHNTl2yGO5KKxGC6Esm7AtjBd+onfu4Rduxut3jdI8GyQCIW8WypwpJofCIyDbTUY4ql0AQUr3JpyVytpnMijlEyr41FfIb4tnDqnRWEsh2H7N7peW+8DWZHDFnYopYZJ9Yu4/jHRYAAACAERG50e6aRRb43biDr7Ab9NUCgM9bC0SQscI/xdlFjac0B/kSWJYTGVARWBDWug705hTnlitY9cLC5Ey/t/OYOjylTavTEfd/bh/8FkAYO+pWdW3hx6p97TBffK0b6nrc6OORT2uKySbbKOn0681nNQh4a6ueR3JRppNkRPnTk5c=" % @kcount,
                 :type => "ssh-dss",
-                :alias => ["192.168.0.%s" % @kcount]
+                :alias => ["192.168.0.%s" % @kcount],
+                :catalog => @catalog
             )
         }
 
@@ -189,4 +192,3 @@ class TestSSHKey < Test::Unit::TestCase
     end
 end
 
-# $Id: sshkey.rb 2551 2007-06-04 20:37:14Z luke $

data/test/ral/types/tidy.rb

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
+require 'puppettest/support/utils'
 
 class TestTidy < Test::Unit::TestCase
+    include PuppetTest::Support::Utils
     include PuppetTest::FileTesting
     def mktmpfile
         # because luke's home directory is on nfs, it can't be used for testing
@@ -55,7 +57,7 @@ class TestTidy < Test::Unit::TestCase
         assert_nothing_raised {
             link = newlink(:target => source, :recurse => true)
         }
-        comp = newcomp("linktest",link)
+        comp = mk_catalog("linktest",link)
         cycle(comp)
 
         path = link.name
@@ -205,7 +207,14 @@ class TestTidy < Test::Unit::TestCase
         assert_apply(tidy)
         assert(! FileTest.exists?(path), "file did not get tidied")
         
+        tidy.class.clear
+
         # Now try one with just an age attribute.
+        time = Time.now - 10
+        stat = stub 'stat', :mtime => time, :atime => time, :ftype => "file"
+        File.stubs(:lstat)
+        File.stubs(:lstat).with(path).returns(stat)
+
         File.open(path, "w") { |f| 10.times { f.puts "yayness " } }
         tidy = Puppet::Type.type(:tidy).create :path => path, :age => "5s"
         
@@ -226,6 +235,57 @@ class TestTidy < Test::Unit::TestCase
         assert_apply(tidy)
         assert(! FileTest.symlink?(link), "link was not tidied")
     end
+
+    def test_glob_matches_single
+        dir = mktmpdir
+        files = {
+          :remove => File.join(dir, "01-foo"),
+          :keep   => File.join(dir, "default")
+        }
+        files.each do |tag, file|
+          File.open(file, "w") { |f|
+              f.puts "some stuff"
+          }
+        end
+
+        tidy = Puppet.type(:tidy).create(
+            :name => dir,
+            :size => "1b",
+            :rmdirs => true,
+            :recurse => true,
+            :matches => "01-*"
+        )
+        assert_apply(tidy)
+
+        assert(FileTest.exists?(files[:keep]), "%s was tidied" % files[:keep])
+        assert(!FileTest.exists?(files[:remove]), "Tidied %s still exists" % files[:remove])
+    end
+
+    def test_glob_matches_multiple
+        dir = mktmpdir
+        files = {
+          :remove1 => File.join(dir, "01-foo"),
+          :remove2 => File.join(dir, "02-bar"),
+          :keep1   => File.join(dir, "default")
+        }
+        files.each do |tag, file|
+          File.open(file, "w") { |f|
+              f.puts "some stuff"
+          }
+        end
+
+        tidy = Puppet.type(:tidy).create(
+            :name => dir,
+            :size => "1b",
+            :rmdirs => true,
+            :recurse => true,
+            :matches => ["01-*", "02-*"]
+        )
+        assert_apply(tidy)
+
+        assert(FileTest.exists?(files[:keep1]), "%s was tidied" % files[:keep1])
+        assert(!FileTest.exists?(files[:remove1]), "Tidied %s still exists" % files[:remove1])
+        assert(!FileTest.exists?(files[:remove2]), "Tidied %s still exists" % files[:remove2])
+    end
 end
 
-# $Id: tidy.rb 2487 2007-05-09 01:51:20Z ballman $

data/test/ral/types/user.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'etc'
@@ -82,7 +82,7 @@ class TestUser < Test::Unit::TestCase
         old = user.provider.ensure
         user[:ensure] = :absent
 
-        comp = newcomp("ensuretest", user)
+        comp = mk_catalog("ensuretest", user)
         assert_apply(user)
         assert(!user.provider.exists?, "User is still present")
         user[:ensure] = :present
@@ -102,7 +102,7 @@ class TestUser < Test::Unit::TestCase
         old = user.provider.comment
         user[:comment] = "A different comment"
 
-        comp = newcomp("commenttest", user)
+        comp = mk_catalog("commenttest", user)
 
         trans = assert_events([:user_changed], comp, "user")
 
@@ -117,7 +117,7 @@ class TestUser < Test::Unit::TestCase
 
     def attrtest_home(user)
         obj = nil
-        comp = newcomp("hometest", user)
+        comp = mk_catalog("hometest", user)
 
         old = user.provider.home
         user[:home] = old
@@ -137,7 +137,7 @@ class TestUser < Test::Unit::TestCase
 
     def attrtest_shell(user)
         old = user.provider.shell
-        comp = newcomp("shelltest", user)
+        comp = mk_catalog("shelltest", user)
 
         user[:shell] = old
 
@@ -167,7 +167,7 @@ class TestUser < Test::Unit::TestCase
     def attrtest_gid(user)
         obj = nil
         old = user.provider.gid
-        comp = newcomp("gidtest", user)
+        comp = mk_catalog("gidtest", user)
 
         user.retrieve
 
@@ -216,7 +216,7 @@ class TestUser < Test::Unit::TestCase
 
     def attrtest_uid(user)
         obj = nil
-        comp = newcomp("uidtest", user)
+        comp = mk_catalog("uidtest", user)
 
         user.provider.uid = 1
 
@@ -387,7 +387,7 @@ class TestUser < Test::Unit::TestCase
             ogroup = Puppet.type(:group).create(
                 :name => "yayness"
             )
-            comp = newcomp(user, group, home, ogroup)
+            comp = mk_catalog(user, group, home, ogroup)
         }
         
         rels = nil
@@ -404,7 +404,7 @@ class TestUser < Test::Unit::TestCase
 
         user = mkuser(name)
 
-        comp = newcomp("usercomp", user)
+        comp = mk_catalog("usercomp", user)
 
         trans = assert_events([:user_created], comp, "user")
 
@@ -424,7 +424,7 @@ class TestUser < Test::Unit::TestCase
 
         assert(! user.provider.exists?, "User %s is present" % name)
 
-        comp = newcomp("usercomp", user)
+        comp = mk_catalog("usercomp", user)
 
         trans = assert_events([:user_created], comp, "user")
 
@@ -490,4 +490,3 @@ class TestUser < Test::Unit::TestCase
     end
 end
 
-# $Id: user.rb 2501 2007-05-09 23:08:42Z luke $

data/test/ral/types/yumrepo.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'fileutils'

data/test/ral/types/zone.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/type/zone'
@@ -418,4 +418,3 @@ end
     end
 end
 
-# $Id: zone.rb 2576 2007-06-14 03:39:00Z luke $

data/test/util/autoload.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/autoload'
@@ -50,11 +50,6 @@ TestAutoload.newthing(:#{name.to_s})
         return rbdir, loader
     end
 
-    def teardown
-        super
-        Puppet::Util::Autoload.clear
-    end
-
     def test_load
         dir, loader = mk_loader(:yayness)
 
@@ -84,36 +79,18 @@ TestAutoload.newthing(:#{name.to_s})
         assert(self.class.thing?(:mything),
                 "Did not get loaded thing")
 
-        # Now clear everything, and test loadall
-        assert_nothing_raised {
-            Puppet::Util::Autoload.clear
-        }
-
         self.class.clear
 
-        assert_nothing_raised {
-            loader.loadall
-        }
-
         [:mything, :othing].each do |thing|
+            loader.load(thing)
             assert(loader.loaded?(thing), "#{thing.to_s} not considered loaded")
             assert(loader.loaded?("%s.rb" % thing), "#{thing.to_s} not considered loaded with .rb")
             assert(Puppet::Util::Autoload.loaded?("yayness/%s" % thing), "%s not considered loaded by the main class" % thing)
             assert(Puppet::Util::Autoload.loaded?("yayness/%s.rb" % thing), "%s not considered loaded by the main class with .rb" % thing)
 
-            loaded = Puppet::Util::Autoload.loaded?("yayness/%s.rb" % thing)
-            assert_equal("%s/%s.rb" % [dir, thing], loaded[:file], "File path was not set correctly in loaded store")
-            assert_equal(self.class, loaded[:autoloader], "Loader was not set correctly in loaded store")
-
             assert(self.class.thing?(thing),
                     "Did not get loaded #{thing.to_s}")
         end
-
-        Puppet::Util::Autoload.clear
-        [:mything, :othing].each do |thing|
-            assert(! loader.loaded?(thing), "#{thing.to_s} considered loaded after clear")
-            assert(! Puppet::Util::Autoload.loaded?("yayness/%s" % thing), "%s considered loaded by the main class after clear" % thing)
-        end
     end
 
     # Make sure that autoload dynamically modifies $: with the libdir as
@@ -125,6 +102,25 @@ TestAutoload.newthing(:#{name.to_s})
 
         assert(loader.send(:searchpath).include?(dir), "searchpath does not include the libdir")
     end
-end
 
-# $Id: autoload.rb 2668 2007-07-10 04:00:28Z luke $
+    # This causes very strange behaviour in the tests.  We need to make sure we
+    # require the same path that a user would use, otherwise we'll result in
+    # a reload of the 
+    def test_require_does_not_cause_reload
+        loadname = "testing"
+        loader = Puppet::Util::Autoload.new(self.class, loadname)
+
+        basedir = "/some/dir"
+        dir = File.join(basedir, loadname)
+        loader.expects(:eachdir).yields(dir)
+
+        subname = "instance"
+
+        file = File.join(dir, subname) + ".rb"
+
+        Dir.expects(:glob).with("#{dir}/*.rb").returns(file)
+
+        Kernel.expects(:require).with(File.join(loadname, subname))
+        loader.loadall
+    end
+end