Skip to content

Commit ca3396e

Browse files
committed
Merge branch 'ticket/master/8663-windows-spec-tests'
* ticket/master/8663-windows-spec-tests: (#8663) Disable spec tests for unsupported functionality on Windows
2 parents 0668c5e + d9ce88d commit ca3396e

6 files changed

Lines changed: 11 additions & 11 deletions

File tree

spec/integration/parser/compiler_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Puppet.settings.clear
1414
end
1515

16-
it "should be able to determine the configuration version from a local version control repository", :fails_on_windows => true do
16+
it "should be able to determine the configuration version from a local version control repository" do
1717
# This should always work, because we should always be
1818
# in the puppet repo when we run this.
1919
version = %x{git rev-parse HEAD}.chomp

spec/integration/provider/mount_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require 'puppet/file_bucket/dipper'
44

5-
describe "mount provider (integration)", :fails_on_windows => true do
5+
describe "mount provider (integration)", :unless => Puppet.features.microsoft_windows? do
66
include PuppetSpec::Files
77

88
def create_fake_fstab(initially_contains_entry)

spec/integration/provider/ssh_authorized_key_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper'
44
require 'puppet/file_bucket/dipper'
55

6-
describe "ssh_authorized_key provider (integration)", :fails_on_windows => true do
6+
describe "ssh_authorized_key provider (integration)", :unless => Puppet.features.microsoft_windows? do
77
include PuppetSpec::Files
88

99
before :each do

spec/unit/provider/exec/shell_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
provider_class = Puppet::Type.type(:exec).provider(:shell)
55

6-
describe provider_class, :fails_on_windows => true do
6+
describe provider_class, :unless => Puppet.features.microsoft_windows? do
77
before :each do
88
@resource = Puppet::Resource.new(:exec, 'foo')
99
@provider = provider_class.new(@resource)

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
provider_class = Puppet::Type.type(:ssh_authorized_key).provider(:parsed)
77

8-
describe provider_class do
8+
describe provider_class, :unless => Puppet.features.microsoft_windows? do
99
include PuppetSpec::Files
1010

1111
before :each do
@@ -77,7 +77,7 @@ def genkey(key)
7777
end
7878
end
7979

80-
describe provider_class do
80+
describe provider_class, :unless => Puppet.features.microsoft_windows? do
8181
before :each do
8282
@resource = Puppet::Type.type(:ssh_authorized_key).new(:name => "foo", :user => "random_bob")
8383

@@ -128,7 +128,7 @@ def genkey(key)
128128
end
129129
end
130130

131-
describe "and a user has been specified with no target", :fails_on_windows => true do
131+
describe "and a user has been specified with no target" do
132132
before :each do
133133
@resource[:user] = "nobody"
134134
#
@@ -189,7 +189,7 @@ def genkey(key)
189189
end
190190
end
191191

192-
describe "and a invalid user has been specified with no target", :fails_on_windows => true do
192+
describe "and a invalid user has been specified with no target" do
193193
it "should catch an exception and raise a Puppet error" do
194194
@resource[:user] = "thisusershouldnotexist"
195195

spec/unit/type/ssh_authorized_key_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
ssh_authorized_key = Puppet::Type.type(:ssh_authorized_key)
55

6-
describe ssh_authorized_key do
6+
describe ssh_authorized_key, :unless => Puppet.features.microsoft_windows? do
77
include PuppetSpec::Files
88

99
before do
@@ -182,7 +182,7 @@
182182
proc { @class.new(:name => "whev", :type => :rsa, :target => "/tmp/here") }.should_not raise_error
183183
end
184184

185-
it "should use the user's path if not explicitly specified", :fails_on_windows => true do
185+
it "should use the user's path if not explicitly specified" do
186186
@class.new(:name => "whev", :user => 'root').should(:target).should == File.expand_path("~root/.ssh/authorized_keys")
187187
end
188188

@@ -228,7 +228,7 @@
228228
end
229229

230230

231-
describe "when user is specified", :unless => Puppet.features.microsoft_windows? do
231+
describe "when user is specified" do
232232

233233
it "should determine target" do
234234
resource = @class.create(

0 commit comments

Comments
 (0)