diff options
| author | Luke Kanies <luke@madstop.com> | 2009-04-02 19:41:17 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2009-04-02 19:41:17 -0500 |
| commit | a677e26eb1452c08d7724047a18e50f4a654d2cd (patch) | |
| tree | 1a615f93e0504527db08ff29bd71e7d754228747 /spec/integration/bin | |
| parent | e016307f00fe67dc53f8581f08c1dfb5ab7dfb3b (diff) | |
| download | puppet-a677e26eb1452c08d7724047a18e50f4a654d2cd.tar.gz puppet-a677e26eb1452c08d7724047a18e50f4a654d2cd.tar.xz puppet-a677e26eb1452c08d7724047a18e50f4a654d2cd.zip | |
Fixing all tests that were apparently broken in the 0.24.x merge.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'spec/integration/bin')
| -rwxr-xr-x | spec/integration/bin/puppetmasterd.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/integration/bin/puppetmasterd.rb b/spec/integration/bin/puppetmasterd.rb index 447344472..b5a3f96da 100755 --- a/spec/integration/bin/puppetmasterd.rb +++ b/spec/integration/bin/puppetmasterd.rb @@ -50,7 +50,8 @@ describe "puppetmasterd" do args = arguments + addl_args - output = %x{puppetmasterd #{args}}.chomp + bin = File.join(File.dirname(__FILE__), "..", "..", "..", "sbin", "puppetmasterd") + output = %x{#{bin} #{args}}.chomp end def stop |