diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-19 15:29:51 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-07-19 15:29:51 -0700 |
| commit | c1e83597712f4553960b42aebc3ab45ae272e724 (patch) | |
| tree | f73ca2d25c43ce38b98331983694dd0791486fe2 | |
| parent | 21c5929aae899e559e9a813c48424da4fcbec54b (diff) | |
| parent | 62a3e2296b872ee9f0ee3c03c9c77215dcd215c5 (diff) | |
| download | puppet-c1e83597712f4553960b42aebc3ab45ae272e724.tar.gz puppet-c1e83597712f4553960b42aebc3ab45ae272e724.tar.xz puppet-c1e83597712f4553960b42aebc3ab45ae272e724.zip | |
Merge branch 'feature/master/8268-puppet-agent-windows'
* feature/master/8268-puppet-agent-windows:
Fix spec test failure on 1.9.2
| -rwxr-xr-x | spec/unit/parser/type_loader_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/parser/type_loader_spec.rb b/spec/unit/parser/type_loader_spec.rb index fd991ffc4..8b139613a 100755 --- a/spec/unit/parser/type_loader_spec.rb +++ b/spec/unit/parser/type_loader_spec.rb @@ -71,7 +71,7 @@ describe Puppet::Parser::TypeLoader do end it "should parse each found file" do - Puppet::Parser::Files.expects(:find_manifests).returns ["modname", make_absolute("/one")] + Puppet::Parser::Files.expects(:find_manifests).returns ["modname", [make_absolute("/one")]] @loader.expects(:parse_file).with(make_absolute("/one")).returns(Puppet::Parser::AST::Hostclass.new('')) @loader.import("myfile") end |
