diff options
| author | Daniel Pittman <daniel@rimspace.net> | 2011-03-03 18:11:22 -0800 |
|---|---|---|
| committer | Daniel Pittman <daniel@rimspace.net> | 2011-03-03 18:11:57 -0800 |
| commit | 455d1978c31c56ad95dd8289552c99891d09bdee (patch) | |
| tree | 61306cfabf60d341d5da2d8d4b79c312c5edebb5 /spec/lib | |
| parent | 85a743b7e87649c149c9914b6e0909472d059517 (diff) | |
| download | puppet-455d1978c31c56ad95dd8289552c99891d09bdee.tar.gz puppet-455d1978c31c56ad95dd8289552c99891d09bdee.tar.xz puppet-455d1978c31c56ad95dd8289552c99891d09bdee.zip | |
(#6582) Don't demand the checkout be named 'puppet'.
As part of implementing the fixture support I hard-coded the assumption that
the git checkout was a directory named 'puppet'; this broke on our CI server,
and would break for anyone else who didn't follow that default.
This commit eliminates that assumption and depends only on the appropriate
part of the input filename.
Reviewed-By: Paul Berry <paul@puppetlabs.com>
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/puppet_spec/fixtures.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/puppet_spec/fixtures.rb b/spec/lib/puppet_spec/fixtures.rb index 96bb1e39d..7f6bc2a8f 100644 --- a/spec/lib/puppet_spec/fixtures.rb +++ b/spec/lib/puppet_spec/fixtures.rb @@ -5,7 +5,7 @@ module PuppetSpec::Fixtures def my_fixture_dir callers = caller while line = callers.shift do - next unless found = line.match(%r{puppet/spec/(.*)_spec\.rb:}) + next unless found = line.match(%r{/spec/(.*)_spec\.rb:}) return fixtures(found[1]) end fail "sorry, I couldn't work out your path from the caller stack!" |