From e0d46da26009d45691163ebc103c8b3dbfe476ff Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 8 Nov 2023 16:36:42 +0200 Subject: [PATCH] Update golden files due to fatih changes Closing characters changed recently with latest fatih but there is no visible change. Update the golden files on those tests. --- .../testdata/TestColorizePolicies/golden | 14 +++++++------- .../golden/current_user_applied_gpos | 4 ++-- ...current_user_with_default_domain_completion | 4 ++-- .../golden/current_user_with_domain_username | 4 ++-- .../detailed_policy_with_overrides_(all) | 18 +++++++++--------- .../golden/detailed_policy_without_override | 18 +++++++++--------- .../golden/other_user_applied_gpos | 4 ++-- .../other_user_applied_gpos_with_mixed_case | 4 ++-- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/cmd/adsysd/client/testdata/TestColorizePolicies/golden b/cmd/adsysd/client/testdata/TestColorizePolicies/golden index 29a3b4c91..bd17dd65b 100644 --- a/cmd/adsysd/client/testdata/TestColorizePolicies/golden +++ b/cmd/adsysd/client/testdata/TestColorizePolicies/golden @@ -1,19 +1,19 @@ -Policies from machine configuration: +Policies from machine configuration: - GPOName1 ({GPOId1}) - - dconf: + - dconf: - path/to/key1: ValueOfKey1 - path/to/key2: ValueOfKey2 - path/to/systemdefault: Locked to system default - - scripts: + - scripts: - path/to/key3: Disabled - GPOName2 ({GPOId2}) - - dconf: + - dconf: - path/to/keyGpo2-1: ValueOfKeyGpo2-1 -Policies from user configuration: +Policies from user configuration: - GPOName3 ({GPOId2}) - - dconf: + - dconf:  - path/to/key1: ValueOfKey1\nOn\nMultilines  - path/to/key2: ValueOfKey2 - - scripts: + - scripts:  - path/to/key3: Disabled diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_applied_gpos b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_applied_gpos index f46326359..11aed4f7a 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_applied_gpos +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_applied_gpos @@ -1,8 +1,8 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_default_domain_completion b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_default_domain_completion index f46326359..11aed4f7a 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_default_domain_completion +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_default_domain_completion @@ -1,8 +1,8 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_domain_username b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_domain_username index f46326359..11aed4f7a 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_domain_username +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/current_user_with_domain_username @@ -1,8 +1,8 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_with_overrides_(all) b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_with_overrides_(all) index 73bfed108..762b828ed 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_with_overrides_(all) +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_with_overrides_(all) @@ -1,31 +1,31 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - - dconf: + - dconf: - org/gnome/shell/common-key: machine value - - gdm: + - gdm: - dconf/org/gnome/desktop/interface/clock-format: 24h - dconf/org/gnome/desktop/interface/clock-show-date: false - dconf/org/gnome/desktop/interface/clock-show-weekday: true - - privilege: + - privilege: - allow-local-admins: Disabled - client-admins: bob@example.com,%mygroup@example2.com - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - - dconf: + - dconf: - org/gnome/shell/disabled-value: Locked to system default  - org/gnome/shell/common-key: user value - org/gnome/shell/common-key-user: user value on RnD Policy - org/gnome/shell/favorite-apps: 'libreoffice-writer.desktop'\n'snap-store_ubuntu-software.desktop'\n'yelp.desktop - - scripts: + - scripts: - logon: local-script-user-logon - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - - dconf: + - dconf: - org/gnome/desktop/background/picture-options: stretched - org/gnome/desktop/background/picture-uri: file:///usr/share/backgrounds/canonical.png  - org/gnome/shell/common-key-user: Locked to system default  - org/gnome/shell/favorite-apps: 'firefox.desktop'\n'thunderbird.desktop'\n'org.gnome.Nautilus.desktop' - - scripts: + - scripts: - logon: script-user-logon\nsubdirectory/other-logon - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_without_override b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_without_override index 8bdeddea8..33c8f56a8 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_without_override +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/detailed_policy_without_override @@ -1,28 +1,28 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - - dconf: + - dconf: - org/gnome/shell/common-key: machine value - - gdm: + - gdm: - dconf/org/gnome/desktop/interface/clock-format: 24h - dconf/org/gnome/desktop/interface/clock-show-date: false - dconf/org/gnome/desktop/interface/clock-show-weekday: true - - privilege: + - privilege: - allow-local-admins: Disabled - client-admins: bob@example.com,%mygroup@example2.com - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - - dconf: + - dconf: - org/gnome/shell/disabled-value: Locked to system default - org/gnome/shell/common-key-user: user value on RnD Policy - org/gnome/shell/favorite-apps: 'libreoffice-writer.desktop'\n'snap-store_ubuntu-software.desktop'\n'yelp.desktop - - scripts: + - scripts: - logon: local-script-user-logon - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - - dconf: + - dconf: - org/gnome/desktop/background/picture-options: stretched - org/gnome/desktop/background/picture-uri: file:///usr/share/backgrounds/canonical.png - - scripts: + - scripts: - logon: script-user-logon\nsubdirectory/other-logon - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos index f46326359..11aed4f7a 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos @@ -1,8 +1,8 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) diff --git a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos_with_mixed_case b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos_with_mixed_case index f46326359..11aed4f7a 100644 --- a/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos_with_mixed_case +++ b/cmd/adsysd/integration_tests/testdata/TestPolicyApplied/golden/other_user_applied_gpos_with_mixed_case @@ -1,8 +1,8 @@ -Policies from machine configuration: +Policies from machine configuration: - MainOffice Policy ({C4F393CA-AD9A-4595-AEBC-3FA6EE484285}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9}) -Policies from user configuration: +Policies from user configuration: - RnD Policy ({5EC4DF8F-FF4E-41DE-846B-52AA6FFAF242}) - IT Policy ({75545F76-DEC2-4ADA-B7B8-D5209FD48727}) - Default Domain Policy ({31B2F340-016D-11D2-945F-00C04FB984F9})