diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-18 09:45:10 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-18 09:45:10 -0500 |
| commit | 1405be5d896d7ae539044f28565de48095cceec8 (patch) | |
| tree | fa51d61777aac8adc72cc55bca64efa744fa7ac0 /testsuite | |
| parent | a7c2a14cfecf93d013556dcb703abb8e36bb45e5 (diff) | |
| parent | 259c84f9ddaaf0233a65e686bd8f3346ab0972b0 (diff) | |
| download | bcfg2-1405be5d896d7ae539044f28565de48095cceec8.tar.gz bcfg2-1405be5d896d7ae539044f28565de48095cceec8.tar.bz2 bcfg2-1405be5d896d7ae539044f28565de48095cceec8.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
src/lib/Bcfg2/Server/Plugins/Properties.py
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py index 6d4644ea5..57d8a6835 100644 --- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py +++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py @@ -379,15 +379,15 @@ class TestPOSIXUsers(TestTool): (lxml.etree.Element("POSIXUser", name="test", group="test", home="/home/test", shell="/bin/zsh", gecos="Test McTest"), - ["-m", "-g", "test", "-d", "/home/test", "-s", "/bin/zsh", + ["-g", "test", "-d", "/home/test", "-s", "/bin/zsh", "-c", "Test McTest"]), (lxml.etree.Element("POSIXUser", name="test", group="test", home="/home/test", shell="/bin/zsh", gecos="Test McTest", uid="1001"), - ["-m", "-u", "1001", "-g", "test", "-d", "/home/test", + ["-u", "1001", "-g", "test", "-d", "/home/test", "-s", "/bin/zsh", "-c", "Test McTest"]), (entry, - ["-m", "-g", "test", "-G", "wheel,users", "-d", "/home/test", + ["-g", "test", "-G", "wheel,users", "-d", "/home/test", "-s", "/bin/zsh", "-c", "Test McTest"])] for entry, expected in cases: for action in ["add", "mod", "del"]: |