From 25c5661c1bc20c0cd568f375d85adbb5943be47e Mon Sep 17 00:00:00 2001
From: pvogt09 <50047961+pvogt09@users.noreply.github.com>
Date: Fri, 3 Apr 2020 19:22:30 +0200
Subject: [PATCH] fix stickler errors

Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
---
 test/test_automated_install.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/test_automated_install.py b/test/test_automated_install.py
index c4ab24e3..fef9eb99 100644
--- a/test/test_automated_install.py
+++ b/test/test_automated_install.py
@@ -96,6 +96,7 @@ def test_pihole_user_group_creation(Pihole):
     '''
     check user creation works if user or group already exist
     '''
+    sudo_cmd = 'su --shell /bin/bash --command "{0}" -p root'
     # normal situation where neither user or group exist
     user_create = Pihole.run('''
     source /opt/pihole/basic-install.sh
@@ -111,7 +112,7 @@ def test_pihole_user_group_creation(Pihole):
     expected_stdout = tick_box + ' Checking for user \'pihole\''
     assert expected_stdout in user_create.stdout
     # situation where only group and no user exists
-    Pihole.run('su --shell /bin/bash --command "userdel -r pihole" -p root')
+    Pihole.run(sudo_cmd.format('userdel -r pihole'))
     user_create = Pihole.run('''
     source /opt/pihole/basic-install.sh
     create_pihole_user
@@ -119,10 +120,13 @@ def test_pihole_user_group_creation(Pihole):
     expected_stdout = tick_box + ' Creating user \'pihole\''
     assert expected_stdout in user_create.stdout
     # situation where only user and no group exists
-    Pihole.run('su --shell /bin/bash --command "userdel -r pihole" -p root')
-    Pihole.run('su --shell /bin/bash --command "groupdel pihole" -p root')
-    Pihole.run('su --shell /bin/bash --command "groupadd pihole_dummy" -p root')
-    Pihole.run('su --shell /bin/bash --command "useradd -r --no-user-group -g pihole_dummy -s /usr/sbin/nologin pihole" -p root')
+    Pihole.run(sudo_cmd.format('userdel -r pihole'))
+    Pihole.run(sudo_cmd.format('groupdel pihole'))
+    Pihole.run(sudo_cmd.format('groupadd pihole_dummy'))
+    useradd_dummy = (
+        'useradd -r --no-user-group -g pihole_dummy ' +
+        '-s /usr/sbin/nologin pihole')
+    Pihole.run(sudo_cmd.format(useradd_dummy))
     user_create = Pihole.run('''
     source /opt/pihole/basic-install.sh
     create_pihole_user