diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-09-21 12:12:19 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-09-22 21:11:31 -0700 |
| commit | 99c1019e1d3402ec8e476dc859d5aaef82ec4f69 (patch) | |
| tree | 94c261c7b0eb76a213f4f3186031a4a889bb8471 /spec/unit | |
| parent | 8cd1540f82cbdf903c164bdbc2c7229e34a4178b (diff) | |
[#4798] Puppet doc manifests documentation mode broken
When running puppet doc, if the directory containing the user's
specified manifest file overlaps with the modules directory (i.e. they
are the same directory or one contains the other), Puppet doc would
try to parse the overlapping files twice, triggering an exception
which made the documentation run fail.
Fixed the bug by adding a check to the RDoc::Parser#scan method to
prevent re-parsing of files that have already been parsed. Also added
a spec test to verify that this works.
Diffstat (limited to 'spec/unit')
| -rwxr-xr-x | spec/unit/util/rdoc/parser_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/util/rdoc/parser_spec.rb b/spec/unit/util/rdoc/parser_spec.rb index 79195e657..3614c0a3c 100755 --- a/spec/unit/util/rdoc/parser_spec.rb +++ b/spec/unit/util/rdoc/parser_spec.rb @@ -19,7 +19,7 @@ describe RDoc::Parser do it "should parse puppet files with the puppet parser" do @parser.stubs(:scan_top_level) parser = stub 'parser' - Puppet::Parser::Parser.expects(:new).returns(parser) + Puppet::Parser::Parser.stubs(:new).returns(parser) parser.expects(:parse) parser.expects(:file=).with("module/manifests/init.pp") |