Please review pull request #533: (#12126) Fix autoload spec on windows opened by (pcarlisle)
Description:
When setting libdir the path is expanded, so using the actual libdir setting
in the test instead of expecting it to remain what we initially set it to.
- Opened: Tue Feb 28 18:57:20 UTC 2012
- Based on: puppetlabs:master (e692c7ae5036f5703a46f4a3df6a47c34b5d761b)
- Requested merge: pcarlisle:ticket/master/12126-fix-test (1640db52d84b6cd2056a76f8aa30e53ff2668963)
Diff follows:
diff --git a/spec/unit/util/autoload_spec.rb b/spec/unit/util/autoload_spec.rb
index 5dcfbec..f39cee6 100755
--- a/spec/unit/util/autoload_spec.rb
+++ b/spec/unit/util/autoload_spec.rb
@@ -52,7 +52,7 @@
it "should include the module directories, the Puppet libdir, and all of the Ruby load directories" do
Puppet[:libdir] = %w{/libdir1 /lib/dir/two /third/lib/dir}.join(File::PATH_SEPARATOR)
@autoload.class.expects(:module_directories).returns %w{/one /two}
- @autoload.class.search_directories.should == %w{/one /two /libdir1 /lib/dir/two /third/lib/dir} + $LOAD_PATH
+ @autoload.class.search_directories.should == %w{/one /two} + Puppet[:libdir].split(File::PATH_SEPARATOR) + $LOAD_PATH
end
end
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
