7966fde1ef
- Update to 2018.3.2 See https://docs.saltstack.com/en/latest/topics/releases/2018.3.2.html for full changelog - Added: * accounting-for-when-files-in-an-archive-contain-non-.patch * add-all_versions-parameter-to-include-all-installed-.patch * add-custom-suse-capabilities-as-grains.patch * add-engine-relaying-libvirt-events.patch * add-environment-variable-to-know-if-yum-is-invoked-f.patch * add-other-attribute-to-gecos-fields-to-avoid-inconsi.patch * align-suse-salt-master.service-limitnofiles-limit-wi.patch * avoid-incomprehensive-message-if-crashes.patch * fix-deprecation-warning-bsc-1095507.patch * fix-diffing-binary-files-in-file.get_diff-bsc-109839.patch * fix-unboundlocalerror-in-file.get_diff.patch * fix-zypper.list_pkgs-to-be-aligned-with-pkg-state.patch * prevent-zypper-from-parsing-repo-configuration-from-.patch * remove-old-hack-when-reporting-multiversion-packages.patch * show-recommendations-for-salt-ssh-cross-version-pyth.patch - Modified: * activate-all-beacons-sources-config-pillar-grains.patch * add-saltssh-multi-version-support-across-python-inte.patch * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch * do-not-override-jid-on-returners-only-sending-back-t.patch * enable-passing-a-unix_socket-for-mysql-returners-bsc.patch * fall-back-to-pymysql.patch * feat-add-grain-for-all-fqdns.patch * fix-bsc-1065792.patch * fix-decrease-loglevel-when-unable-to-resolve-addr.patch * fix-for-ec2-rate-limit-failures.patch OBS-URL: https://build.opensuse.org/request/show/626472 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=127
56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
From f515f99ee42ffaba30cee2e1941a7e9af9db7453 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Wed, 18 Apr 2018 12:05:35 +0100
|
|
Subject: [PATCH] Strip trailing commas on Linux user GECOS fields
|
|
|
|
Add unit tests for GECOS fields
|
|
---
|
|
salt/modules/useradd.py | 2 +-
|
|
tests/unit/modules/test_useradd.py | 18 ++++++++++++++++++
|
|
2 files changed, 19 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/modules/useradd.py b/salt/modules/useradd.py
|
|
index 545fe2a6f1..a61ba0e960 100644
|
|
--- a/salt/modules/useradd.py
|
|
+++ b/salt/modules/useradd.py
|
|
@@ -81,7 +81,7 @@ def _build_gecos(gecos_dict):
|
|
return '{0},{1},{2},{3}'.format(gecos_dict.get('fullname', ''),
|
|
gecos_dict.get('roomnumber', ''),
|
|
gecos_dict.get('workphone', ''),
|
|
- gecos_dict.get('homephone', ''))
|
|
+ gecos_dict.get('homephone', '')).rstrip(',')
|
|
|
|
|
|
def _update_gecos(name, key, value, root=None):
|
|
diff --git a/tests/unit/modules/test_useradd.py b/tests/unit/modules/test_useradd.py
|
|
index eb983685bb..fa30a0df71 100644
|
|
--- a/tests/unit/modules/test_useradd.py
|
|
+++ b/tests/unit/modules/test_useradd.py
|
|
@@ -393,3 +393,21 @@ class UserAddTestCase(TestCase, LoaderModuleMockMixin):
|
|
mock = MagicMock(side_effect=[{'name': ''}, False, {'name': ''}])
|
|
with patch.object(useradd, 'info', mock):
|
|
self.assertFalse(useradd.rename('salt', 'salt'))
|
|
+
|
|
+ def test_build_gecos_field(self):
|
|
+ '''
|
|
+ Test if gecos fields are built correctly (removing trailing commas)
|
|
+ '''
|
|
+ test_gecos = {'fullname': 'Testing',
|
|
+ 'roomnumber': 1234,
|
|
+ 'workphone': 22222,
|
|
+ 'homephone': 99999}
|
|
+ expected_gecos_fields = 'Testing,1234,22222,99999'
|
|
+ self.assertEqual(useradd._build_gecos(test_gecos), expected_gecos_fields)
|
|
+ test_gecos.pop('roomnumber')
|
|
+ test_gecos.pop('workphone')
|
|
+ expected_gecos_fields = 'Testing,,,99999'
|
|
+ self.assertEqual(useradd._build_gecos(test_gecos), expected_gecos_fields)
|
|
+ test_gecos.pop('homephone')
|
|
+ expected_gecos_fields = 'Testing'
|
|
+ self.assertEqual(useradd._build_gecos(test_gecos), expected_gecos_fields)
|
|
--
|
|
2.13.7
|
|
|
|
|