Skip to content

Commit f10589c

Browse files
committed
Merge remote-tracking branch 'upstream/6.x' into main
* upstream/6.x: (maint) Expands test to include macOS 12 (maint) Removes irrelevant macOS tests (maint) Remove houndci config Conflicts: acceptance/tests/resource/user/should_modify_home.rb acceptance/tests/resource/user/should_modify_uid.rb Deleted files
2 parents 093c708 + 68a96a9 commit f10589c

File tree

4 files changed

+1
-77
lines changed

4 files changed

+1
-77
lines changed

.hound.yml

-2
This file was deleted.

acceptance/tests/resource/file/ticket_8740_should_not_enumerate_root_directory.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
test_name "#8740: should not enumerate root directory"
22

33
confine :except, :platform => 'windows'
4-
confine :except, :platform => /(osx-10.1[5-9]|osx-11-)/
4+
confine :except, :platform => 'osx'
55

66
tag 'audit:high',
77
'audit:refactor', # Use block style `test_name`

acceptance/tests/resource/user/should_modify_home.rb

-37
This file was deleted.

acceptance/tests/resource/user/should_modify_uid.rb

-37
This file was deleted.

0 commit comments

Comments
 (0)