format: update tests after 09d2ca06

slapos/tests/test_slapformat.py

@@ -822,7 +822,7 @@ class TestUser(SlapformatMixin):
     self.assertEqual([
       'groupadd doesnotexistsyet',
       'useradd -d /doesnotexistsyet -g doesnotexistsyet -s /bin/sh '\
-        'doesnotexistsyet -r',
+        '-r doesnotexistsyet',
       'passwd -l doesnotexistsyet'
     ],
       self.fakeCallAndRead.external_command_list)
@@ -835,8 +835,8 @@ class TestUser(SlapformatMixin):
 
     self.assertEqual([
       'groupadd doesnotexistsyet',
-      'useradd -d /doesnotexistsyet -g doesnotexistsyet -s /bin/sh -G '\
-        'additionalgroup1,additionalgroup2 doesnotexistsyet -r',
+      'useradd -d /doesnotexistsyet -g doesnotexistsyet -s /bin/sh -r -G '\
+        'additionalgroup1,additionalgroup2 doesnotexistsyet',
       'passwd -l doesnotexistsyet'
       ],
       self.fakeCallAndRead.external_command_list)
@@ -849,7 +849,7 @@ class TestUser(SlapformatMixin):
     user.create()
 
     self.assertEqual([
-      'useradd -d /testuser -g testuser -s /bin/sh testuser -r',
+      'useradd -d /testuser -g testuser -s /bin/sh -r testuser',
       'passwd -l testuser'
     ],
       self.fakeCallAndRead.external_command_list)
@@ -864,7 +864,7 @@ class TestUser(SlapformatMixin):
 
     self.assertEqual([
       'groupadd testuser',
-      'usermod -d /testuser -g testuser -s /bin/sh -G '\
+      'usermod -d /testuser -g testuser -s /bin/sh -aG '\
         'additionalgroup1,additionalgroup2 testuser',
       'passwd -l testuser'
     ],