Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
systemsmanagement:Uyuni:Master:CentOS6-Uyuni-Client-Tools
salt
strip-trailing-commas-on-linux-user-gecos-field...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File strip-trailing-commas-on-linux-user-gecos-fields.patch of Package salt
From eea03a8677a4ace1baee37ccf4a23158e943cbde 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/useradd_test.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/salt/modules/useradd.py b/salt/modules/useradd.py index c7c7456bea..2fa3b2d7e2 100644 --- a/salt/modules/useradd.py +++ b/salt/modules/useradd.py @@ -73,7 +73,7 @@ def _build_gecos(gecos_dict): return u'{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/useradd_test.py b/tests/unit/modules/useradd_test.py index cc9e610366..077e8f4239 100644 --- a/tests/unit/modules/useradd_test.py +++ b/tests/unit/modules/useradd_test.py @@ -382,6 +382,23 @@ class UserAddTestCase(TestCase): 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) if __name__ == '__main__': from integration import run_tests -- 2.15.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor