Skip to content

Commit

Permalink
fixup! Update tests golden files and assets
Browse files Browse the repository at this point in the history
  • Loading branch information
@denisonbarbosa
denisonbarbosa committed Dec 2, 2024
1 parent e64f6a7 commit e55daf3
Show file tree
Hide file tree
Showing 60 changed files with 87 additions and 11 deletions.
2 changes: 1 addition & 1 deletion ...conf_(simple)_and_set_client_admins/polkit-1/rules.d/00-adsys-privilege-enforcement.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Any changes will be overwritten.

polkit.addAdminRule(function(action, subject){
return ["unix-group:sudo","unix-group:admin","unix-user:[email protected]"];
return ["unix-user:local40admin1","unix-user:local40admin2","unix-user:[email protected]"];
});
0 ...ti/polkit-1/rules.d/40-local-admins.rules → ...ns/polkit-1/rules.d/40-local-admins.rules
View file
File renamed without changes.
0 ...al-admins-multi/sudoers.d/40-local-admins → ...t_client_admins/sudoers.d/40-local-admins
View file
File renamed without changes.
0 ...with-adsys-file/sudoers.d/40-local-admins → ...t_client_admins/sudoers.d/40-local-admins
View file
File renamed without changes.
0 ...al-admins-multi/sudoers.d/50-local-admins → ...t_client_admins/sudoers.d/50-local-admins
View file
File renamed without changes.
7 changes: 7 additions & 0 deletions ...cal_admins_with_previous_local_admin_conf_and_set_client_admins/sudoers.d/40-local-admins
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file is managed by adsys.
# Do not edit this file manually.
# Any changes will be overwritten.

"[email protected]" ALL=(ALL:ALL) ALL
"[email protected]" ALL=(ALL:ALL) ALL

0 ...ocal-admins-one/sudoers.d/50-local-admins → ...t_client_admins/sudoers.d/50-local-admins
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...al_admin_conf_and_set_client_admins/polkit-1/rules.d/00-adsys-privilege-enforcement.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Any changes will be overwritten.

polkit.addAdminRule(function(action, subject){
return ["unix-group:sudo","unix-group:admin","unix-user:[email protected]"];
return ["unix-user:[email protected]"];
});
7 changes: 7 additions & 0 deletions ...cal_admins_with_previous_local_admin_conf_and_set_client_admins/sudoers.d/40-local-admins
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file is managed by adsys.
# Do not edit this file manually.
# Any changes will be overwritten.

"[email protected]" ALL=(ALL:ALL) ALL
"[email protected]" ALL=(ALL:ALL) ALL

0 ...with-adsys-file/sudoers.d/50-local-admins → ...t_client_admins/sudoers.d/50-local-admins
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...licy/golden/set_client_group_admins/polkit-1/rules.d/00-adsys-privilege-enforcement.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Any changes will be overwritten.

polkit.addAdminRule(function(action, subject){
return ["unix-group:sudo","unix-group:admin","unix-group:[email protected]"];
return ["unix-group:[email protected]"];
});
2 changes: 1 addition & 1 deletion ...t_mixed_with_users_and_group_admins/polkit-1/rules.d/00-adsys-privilege-enforcement.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Any changes will be overwritten.

polkit.addAdminRule(function(action, subject){
return ["unix-group:sudo","unix-group:admin","unix-user:[email protected]","unix-group:[email protected]"];
return ["unix-user:[email protected]","unix-group:[email protected]"];
});
2 changes: 1 addition & 1 deletion ...en/set_client_multiple_users_admins/polkit-1/rules.d/00-adsys-privilege-enforcement.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Any changes will be overwritten.

polkit.addAdminRule(function(action, subject){
return ["unix-group:sudo","unix-group:admin","unix-user:[email protected]","unix-user:bob@domain","unix-user:carole [email protected]"];
return ["unix-user:[email protected]","unix-user:bob@domain","unix-user:carole [email protected]"];
});
2 changes: 1 addition & 1 deletion ...olicy/golden/set_client_user_admins/polkit-1/rules.d/00-adsys-privilege-enforcement.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Any changes will be overwritten.

polkit.addAdminRule(function(action, subject){
return ["unix-group:sudo","unix-group:admin","unix-user:[email protected]"];
return ["unix-user:[email protected]"];
});
2 changes: 1 addition & 1 deletion ...ege/testdata/TestPolkitAdminIdentitiesFromRules/golden/consider_only_first_returned_value
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"unix-user:local50admin1","unix-user:local50admin2"
"unix-user:local40admin1","unix-user:local40admin2"
2 changes: 1 addition & 1 deletion ...vilege/testdata/TestPolkitAdminIdentitiesFromRules/golden/fetch_previous_admin_identities
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"unix-user:local50admin1","unix-user:local50admin2"
"unix-user:local40admin1","unix-user:local40admin2"
0 ...no_existing_history_means_no_files/.empty → ...es.d/00-adsys-privilege-enforcement.rules
View file
File renamed without changes.
0 .../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
View file
File renamed without changes.
Empty file removed internal/policies/privilege/testdata/existing-files/polkit-1/rules.d/.empty
View file
Empty file.
3 changes: 3 additions & 0 deletions ...licies/privilege/testdata/existing-files/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
polkit.addAdminRule(function(action, subject) {
return ["unix-group:sudo", "unix-group:admin"];
});
0 ...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf
View file
File renamed without changes.
0 ...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf
View file
File renamed without changes.
0 .../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions ...ivilege/testdata/existing-old-adsys-conf/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
polkit.addAdminRule(function(action, subject) {
return ["unix-group:sudo", "unix-group:admin"];
});
0 ...her-files/polkit-1/rules.d/notadsys.rules → ...files/etc/polkit-1/rules.d/notadsys.rules
View file
File renamed without changes.
0 ...a/existing-other-files/sudoers.d/notadsys → ...isting-other-files/etc/sudoers.d/notadsys
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions .../privilege/testdata/existing-other-files/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
polkit.addAdminRule(function(action, subject) {
return ["unix-group:sudo", "unix-group:admin"];
});
0 ...le/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
View file
File renamed without changes.
0 ...ns/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
View file
File renamed without changes.
7 changes: 7 additions & 0 deletions ...ies/privilege/testdata/existing-previous-local-admins-multi/etc/sudoers.d/40-local-admins
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file is managed by adsys.
# Do not edit this file manually.
# Any changes will be overwritten.

"[email protected]" ALL=(ALL:ALL) ALL
"[email protected]" ALL=(ALL:ALL) ALL

7 changes: 7 additions & 0 deletions ...ies/privilege/testdata/existing-previous-local-admins-multi/etc/sudoers.d/50-local-admins
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file is managed by adsys.
# Do not edit this file manually.
# Any changes will be overwritten.

"[email protected]" ALL=(ALL:ALL) ALL
"[email protected]" ALL=(ALL:ALL) ALL

3 changes: 3 additions & 0 deletions ...ata/existing-previous-local-admins-multi/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
polkit.addAdminRule(function(action, subject) {
return ["unix-group:sudo", "unix-group:admin"];
});
0 ...le/polkit-2/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
View file
File renamed without changes.
7 changes: 7 additions & 0 deletions ...icies/privilege/testdata/existing-previous-local-admins-one/etc/sudoers.d/40-local-admins
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file is managed by adsys.
# Do not edit this file manually.
# Any changes will be overwritten.

"[email protected]" ALL=(ALL:ALL) ALL
"[email protected]" ALL=(ALL:ALL) ALL

3 changes: 3 additions & 0 deletions ...tdata/existing-previous-local-admins-one/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
polkit.addAdminRule(function(action, subject) {
return ["unix-group:sudo", "unix-group:admin"];
});
2 changes: 1 addition & 1 deletion ...ly/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Any changes will be overwritten.

polkit.addAdminRule(function(action, subject) {
return ["unix-user:local50admin1", "unix-user:local50admin2"];
return ["unix-user:local40admin1", "unix-user:local40admin2"];
});

polkit.addAdminRule(function(action, subject) {
Expand Down
3 changes: 3 additions & 0 deletions ...sting-previous-local-admins-return-early/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
polkit.addAdminRule(function(action, subject) {
return ["unix-group:sudo", "unix-group:admin"];
});
0 ...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...le/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Any changes will be overwritten.

polkit.addAdminRule(function(action, subject) {
return ["unix-user:local50admin1", "unix-user:local50admin2"];
return ["unix-user:local40admin1", "unix-user:local40admin2"];
});
0 ...ti/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
View file
File renamed without changes.
7 changes: 7 additions & 0 deletions ...ege/testdata/existing-previous-local-admins-with-adsys-file/etc/sudoers.d/40-local-admins
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file is managed by adsys.
# Do not edit this file manually.
# Any changes will be overwritten.

"[email protected]" ALL=(ALL:ALL) ALL
"[email protected]" ALL=(ALL:ALL) ALL

7 changes: 7 additions & 0 deletions ...ege/testdata/existing-previous-local-admins-with-adsys-file/etc/sudoers.d/50-local-admins
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file is managed by adsys.
# Do not edit this file manually.
# Any changes will be overwritten.

"[email protected]" ALL=(ALL:ALL) ALL
"[email protected]" ALL=(ALL:ALL) ALL

0 .../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions ...ng-previous-local-admins-with-adsys-file/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
polkit.addAdminRule(function(action, subject) {
return ["unix-group:sudo", "unix-group:admin"];
});
0 ...50-this-is-not-a-file.rules/somethinginit → ...50-this-is-not-a-file.rules/somethinginit
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions ...testdata/incorrect-policikit-conf-is-dir/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
polkit.addAdminRule(function(action, subject) {
return ["unix-group:sudo", "unix-group:admin"];
});
0 ...ne/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...le/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-2/rules.d/40-local-admins.rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Any changes will be overwritten.

polkit.addAdminRule(function(action, subject) {
return ["unix-user:local50admin1", "unix-user:local50admin2"];
return ["unix-user:local40admin1", "unix-user:local40admin2"];
});
0 ...le/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
View file
File renamed without changes.
0 ...le/polkit-2/rules.d/50-local-admins.rules → ...tc/polkit-2/rules.d/50-local-admins.rules
View file
File renamed without changes.
0 ...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf
View file
File renamed without changes.
0 ...kit-1/localauthority.conf.d/75-admin.conf → ...kit-1/localauthority.conf.d/75-admin.conf
View file
File renamed without changes.
0 ...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf
View file
File renamed without changes.
0 .../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
View file
File renamed without changes.
0 ...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf
View file
File renamed without changes.
0 ...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf
View file
File renamed without changes.
0 .../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
View file
File renamed without changes.
0 ...sting_polkit_file/polkit-1/rules.d/.empty → .../only-base-polkit-dir/etc/polkit-1/.empty
View file
File renamed without changes.
Empty file removed internal/policies/privilege/testdata/only-base-polkit-dir/polkit-1/.empty
View file
Empty file.
3 changes: 3 additions & 0 deletions .../privilege/testdata/only-base-polkit-dir/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
polkit.addAdminRule(function(action, subject) {
return ["unix-group:sudo", "unix-group:admin"];
});

0 comments on commit e55daf3

Please sign in to comment.