+.5
It looks good to me, but I'm not sure I totally understand, so I don't
want my vote to count as a full vote. :-(
On Thu, Feb 12, 2009 at 8:30 AM, Paul Nasrat <pnas...@googlemail.com> wrote:
>
> This patch fixes up the puppetmasterd tests to run locally.
>
> Signed-off-by: Paul Nasrat <pnas...@googlemail.com>
> ---
> spec/integration/bin/puppetmasterd.rb | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/spec/integration/bin/puppetmasterd.rb
> b/spec/integration/bin/puppetmasterd.rb
> index 4473444..62956fa 100755
> --- a/spec/integration/bin/puppetmasterd.rb
> +++ b/spec/integration/bin/puppetmasterd.rb
> @@ -10,6 +10,10 @@ describe "puppetmasterd" do
> file.delete
>
> Dir.mkdir(@dir)
> + basedir = File.join(File.dirname(__FILE__),"..", "..", "..")
> + @bindir = File.join(basedir, "bin")
> + @rubylib = ENV["RUBYLIB"]
> + ENV["RUBYLIB"] = File.join(basedir, "lib")
>
> Puppet.settings[:confdir] = @dir
> Puppet.settings[:vardir] = @dir
> @@ -25,6 +29,7 @@ describe "puppetmasterd" do
>
> system("rm -rf %s" % @dir)
> Puppet.settings.clear
> + ENV["RUBYLIB"] = @rubylib
> }
>
> def arguments
> @@ -49,8 +54,9 @@ describe "puppetmasterd" do
> end
>
> args = arguments + addl_args
> + puppetmasterd = File.join(@bindir, "puppetmasterd")
>
> - output = %x{puppetmasterd #{args}}.chomp
> + output = %x{#{puppetmasterd} #{args}}.chomp
> end
>
> def stop
> --
> 1.6.1.2
>
>
> >
>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com
To unsubscribe from this group, send email to
puppet-dev+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
