summaryrefslogtreecommitdiffstats
path: root/spec/unit/application
diff options
context:
space:
mode:
authorJosh Cooper <josh@puppetlabs.com>2011-07-26 14:57:33 -0700
committerJosh Cooper <josh@puppetlabs.com>2011-07-26 14:57:33 -0700
commit770e30d620271f988321ea45c108fb167ab55ad7 (patch)
tree48a4bcd382919164b3938e9a20de97cf6ab89a2b /spec/unit/application
parentb13427b56d8529731d0334d420b24a592ecb43ea (diff)
parent9279d0954eb20d75e18a666fd572b5492e157608 (diff)
downloadpuppet-770e30d620271f988321ea45c108fb167ab55ad7.tar.gz
puppet-770e30d620271f988321ea45c108fb167ab55ad7.tar.xz
puppet-770e30d620271f988321ea45c108fb167ab55ad7.zip
Merge branch 'feature/master/8268-puppet-agent-windows'
* feature/master/8268-puppet-agent-windows: Fix issue with forward and backslashes in Windows paths Disable spec tests for unsupported functionality on Windows Update certificate spec tests for Windows
Diffstat (limited to 'spec/unit/application')
-rwxr-xr-xspec/unit/application/inspect_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/application/inspect_spec.rb b/spec/unit/application/inspect_spec.rb
index be5887f01..750f25ab8 100755
--- a/spec/unit/application/inspect_spec.rb
+++ b/spec/unit/application/inspect_spec.rb
@@ -148,7 +148,7 @@ describe Puppet::Application::Inspect do
@inspect.run_command
end
- it "should not send unreadable files", :fails_on_windows => true do
+ it "should not send unreadable files", :unless => Puppet.features.microsoft_windows? do
File.open(@file, 'w') { |f| f.write('stuff') }
File.chmod(0, @file)
Puppet::FileBucketFile::Rest.any_instance.expects(:head).never