Skip to content

Commit 6efedf4

Browse files
(maint) Merge up 57a1d2f to main
Generated by CI * commit '57a1d2f8c4b4a397649d173395b636fdb78b0c9a': (maint) Mark some tests as pending for Windows 11
2 parents 7156126 + 57a1d2f commit 6efedf4

8 files changed

+15
-7
lines changed

acceptance/tests/agent/agent_fails_with_unknown_resource.rb

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

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

acceptance/tests/modulepath.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
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+
46
# beacon custom type emits a message so we can tell where the
57
# type was loaded from, e.g. vendored, global, and whether the
68
# type was loaded locally or pluginsynced from the master.

acceptance/tests/resource/file/ticket_6448_file_with_utf8_source.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
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+
1719
agent_tmp_dirs[agent_to_fqdn(agent)] = agent.tmpdir(tmp_environment)
1820
end
1921

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

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

77
agents.each do |agent|
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
8+
pending_test("Windows 11 backslashes") if agent['platform'] =~ /windows-11/
149

1510
step "Create file content"
1611
real_source = agent.tmpfile('follow_links_source')

acceptance/tests/resource/service/windows_mixed_utf8.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ 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+
4143
setup_service(agent, mock_service, 'MockService.cs')
4244

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

acceptance/tests/resource/user/should_modify_when_not_managing_home.rb

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
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/
1415

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
extend Puppet::Acceptance::I18nUtils
1616

1717
agents.each do |host|
18+
pending_test("Windows 11 UTF-8 file paths") if host['platform'] =~ /windows-11/
19+
1820
filename = "Fișier"
1921
content = <<-CONTENT
2022
閑けさや

0 commit comments

Comments
 (0)