Skip to content

Commit cc6948f

Browse files
committed
Revert "Merge pull request #8920 from joshcooper/win11_6x"
This reverts commit 57a1d2f, reversing changes made to f638242.
1 parent 994060f commit cc6948f

8 files changed

+7
-15
lines changed

acceptance/tests/agent/agent_fails_with_unknown_resource.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99

1010
require 'puppet/acceptance/temp_file_utils'
1111
extend Puppet::Acceptance::TempFileUtils
12-
13-
pending_test("Windows 11 not sure why this fails") if agents.any? { |host| host['platform'] =~ /windows-11/ }
14-
12+
1513
step "agent should fail when it can't find a resource" do
1614
vendor_modules_path = master.tmpdir('vendor_modules')
1715
tmp_environment = mk_tmp_environment_with_teardown(master, 'tmp')

acceptance/tests/modulepath.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
test_name 'Supports vendored modules' do
22
tag 'risk:high'
33

4-
pending_test("Windows 11 scp seems to crash sshd") if agents.any? { |host| host['platform'] =~ /windows-11/ }
5-
64
# beacon custom type emits a message so we can tell where the
75
# type was loaded from, e.g. vendored, global, and whether the
86
# type was loaded locally or pluginsynced from the master.

acceptance/tests/resource/file/ticket_6448_file_with_utf8_source.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
agent_tmp_dirs = {}
1515

1616
agents.each do |agent|
17-
pending_test("Windows 11 UTF-8 file paths") if agent['platform'] =~ /windows-11/
18-
1917
agent_tmp_dirs[agent_to_fqdn(agent)] = agent.tmpdir(tmp_environment)
2018
end
2119

acceptance/tests/resource/file/ticket_7680-follow-symlinks.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
'audit:acceptance'
66

77
agents.each do |agent|
8-
pending_test("Windows 11 backslashes") if agent['platform'] =~ /windows-11/
8+
if agent.platform.variant == 'windows'
9+
# symlinks are supported only on Vista+ (version 6.0 and higher)
10+
on agent, facter('kernelmajversion') do
11+
skip_test "Test not supported on this platform" if stdout.chomp.to_f < 6.0
12+
end
13+
end
914

1015
step "Create file content"
1116
real_source = agent.tmpfile('follow_links_source')

acceptance/tests/resource/service/windows_mixed_utf8.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ def service_manifest(name, params)
3838
}
3939
].each do |mock_service|
4040
agents.each do |agent|
41-
pending_test("Windows 11 UTF-8 file paths") if agent['platform'] =~ /windows-11/
42-
4341
setup_service(agent, mock_service, 'MockService.cs')
4442

4543
step 'Verify that enable = false disables the service' do

acceptance/tests/resource/user/should_modify_when_not_managing_home.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ def get_home_dir(host, user_name)
2626
home_prop = nil
2727
case agent['platform']
2828
when /windows/
29-
pending_test("Windows 11 backslashes") if agent['platform'] =~ /windows-11/
30-
3129
# Sadly Windows ADSI won't tell us the default home directory
3230
# for a user. You can get it via WMI Win32_UserProfile, but that
3331
# doesn't exist in a base 2003 install. So we simply specify an

acceptance/tests/utf8/utf8-in-catalog.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
on(master, "rm -rf '#{codedir}'")
1212
env_dir = "#{codedir}/environments"
1313
agents.each do |agent|
14-
pending_test("Windows 11 UTF-8 file paths") if agent['platform'] =~ /windows-11/
1514

1615
step "agent name: #{agent.hostname}, platform: #{agent.platform}"
1716
agent_vardir = agent.tmpdir("agent_vardir")

acceptance/tests/utf8/utf8-recursive-copy.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
extend Puppet::Acceptance::I18nUtils
1919

2020
agents.each do |host|
21-
pending_test("Windows 11 UTF-8 file paths") if host['platform'] =~ /windows-11/
22-
2321
filename = "Fișier"
2422
content = <<-CONTENT
2523
閑けさや

0 commit comments

Comments
 (0)