nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

backups: Avoid using sudo in tests

Browse Source 
Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
This commit is contained in:
Joseph Nuthalapati 2019-05-22 12:45:19 +05:30
parent d451b54286
commit ee21dcfbb8
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plinth/modules/backups/tests/test_ssh_remotes.py
View File

@ -31,7 +31,7 @@ from plinth.utils import generate_password, random_string
from .. import forms from .. import forms
pytestmark = pytest.mark.usefixtures('needs_root', 'needs_sudo') pytestmark = pytest.mark.usefixtures('needs_root')
@pytest.fixture(name='temp_home', scope='module', autouse=True) @pytest.fixture(name='temp_home', scope='module', autouse=True)
@ -43,7 +43,7 @@ def fixture_temp_home_directory():
dir_name = f'/tmp/{random_string()}' dir_name = f'/tmp/{random_string()}'
os.mkdir(dir_name) os.mkdir(dir_name)
yield dir_name yield dir_name
subprocess.check_call(['sudo', 'rm', '-rf', dir_name]) subprocess.check_call(['rm', '-rf', dir_name])
@pytest.fixture(name='password', scope='module', autouse=True) @pytest.fixture(name='password', scope='module', autouse=True)
@ -59,20 +59,20 @@ def fixture_create_temp_user(temp_home, password):
# User account expires tomorrow # User account expires tomorrow
tomorrow = datetime.date.today() + datetime.timedelta(days=1) tomorrow = datetime.date.today() + datetime.timedelta(days=1)
subprocess.check_call([ subprocess.check_call([
'sudo', 'useradd', '-d', temp_home, '-m', '-p', password, username, 'useradd', '-d', temp_home, '-m', '-p', password, username, '-e',
'-e',
tomorrow.strftime('%Y-%m-%d') tomorrow.strftime('%Y-%m-%d')
]) ])
subprocess.check_call(['sudo', 'chown', username, temp_home]) subprocess.check_call(['chown', username, temp_home])
yield username yield username
subprocess.check_call(['sudo', 'userdel', username]) subprocess.check_call(['userdel', username])
@pytest.mark.usefixtures('needs_sudo')
@pytest.fixture(name='has_ssh_key', scope='module', autouse=True) @pytest.fixture(name='has_ssh_key', scope='module', autouse=True)
def fixture_ssh_key(temp_home, temp_user, password): def fixture_ssh_key(temp_home, temp_user, password):
subprocess.check_call([ subprocess.check_call([
'sudo', '-u', temp_user, 'ssh-keygen', '-t', 'rsa', '-b', '1024', '-N', 'sudo', '-n', '-u', temp_user, 'ssh-keygen', '-t', 'rsa', '-b', '1024',
'', '-f', f'{temp_home}/.ssh/id_rsa', '-q' '-N', '', '-f', f'{temp_home}/.ssh/id_rsa', '-q'
]) ])