summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorHelen <helen@puppetlabs.com>2017-07-07 16:11:44 +0100
committerGitHub <noreply@github.com>2017-07-07 16:11:44 +0100
commit4a980fc92233f2d9ee32e5628522aef3b870896e (patch)
tree577b19c3576a05353a078eccb888b71607f0577d /spec
parent517a133209a0b0f8741029c247fea595b50d801e (diff)
parent700b735893b77f6ebc6420f72f1e474d5053f12b (diff)
Merge pull request #789 from tphoney/MODULES-5186
(MODULES-5186) - do not run file_line unit tests on windows.
Diffstat (limited to 'spec')
-rw-r--r--spec/functions/ensure_resources_spec.rb (renamed from spec/unit/ensure_resources_spec.rb)0
-rwxr-xr-xspec/unit/puppet/provider/file_line/ruby_spec.rb3
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/unit/ensure_resources_spec.rb b/spec/functions/ensure_resources_spec.rb
index aea723e..aea723e 100644
--- a/spec/unit/ensure_resources_spec.rb
+++ b/spec/functions/ensure_resources_spec.rb
diff --git a/spec/unit/puppet/provider/file_line/ruby_spec.rb b/spec/unit/puppet/provider/file_line/ruby_spec.rb
index 1f41f62..3d28687 100755
--- a/spec/unit/puppet/provider/file_line/ruby_spec.rb
+++ b/spec/unit/puppet/provider/file_line/ruby_spec.rb
@@ -2,7 +2,8 @@
require 'spec_helper'
require 'tempfile'
provider_class = Puppet::Type.type(:file_line).provider(:ruby)
-describe provider_class do
+# These tests fail on windows when run as part of the rake task. Individually they pass
+describe provider_class, :unless => Puppet::Util::Platform.windows? do
context "when adding" do
let :tmpfile do
tmp = Tempfile.new('tmp')