Please review pull request #259: Ticket/2.7.x/11276 module tool tar on windows opened by (mmrobins)
Description:
Fix the module_tool specs on windows. This involves marking some as fails_on_windows until we figure out how to deal with Windows interacting with with tar.gz files. http://projects.puppetlabs.com/issues/11276
And a few tests just needed an expand_path set on a directory so that the c:\ didn't mess up the expectation.
- Opened: Thu Dec 08 01:16:31 UTC 2011
- Based on: puppetlabs:2.7.x (0f56154d3cdcb49106dd1a17687dd69492f02be4)
- Requested merge: mmrobins:ticket/2.7.x/11276_module_tool_tar_on_windows (1e8e34bfba3a8344da87932a6ac4936010c26ff9)
Diff follows:
diff --git a/spec/integration/module_tool_spec.rb b/spec/integration/module_tool_spec.rb
index 9f9f491..1067bfa 100644
--- a/spec/integration/module_tool_spec.rb
+++ b/spec/integration/module_tool_spec.rb
@@ -59,7 +59,7 @@ def install_release_fixture(name)
FileUtils.cp_r(release_fixture(name), name)
end
-describe "module_tool" do
+describe "module_tool", :fails_on_windows => true do
include PuppetSpec::Files
before do
@tmp_confdir = Puppet[:confdir] = tmpdir("module_tool_test_confdir")
diff --git a/spec/unit/face/module/install_spec.rb b/spec/unit/face/module/install_spec.rb
index 8e7e397..6811097 100644
--- a/spec/unit/face/module/install_spec.rb
+++ b/spec/unit/face/module/install_spec.rb
@@ -1,5 +1,6 @@
require 'spec_helper'
require 'puppet/face'
+require 'puppet/module_tool'
describe "puppet module install" do
subject { Puppet::Face[:module, :current] }
@@ -11,7 +12,7 @@
describe "option validation" do
let(:expected_options) do
{
- :install_dir => "/dev/null/modules",
+ :install_dir => File.expand_path("/dev/null/modules"),
:module_repository => "http://forge.puppetlabs.com",
}
end
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
