nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-01-21 07:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Fix failing path validation unit tests

Browse Source 
Due to improper python include path. Don't know why the problem surfaced.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Joseph Nuthalapati <njoseph@riseup.net>
This commit is contained in:
Sunil Mohan Adapa 2020-05-19 13:07:19 -07:00 committed by Joseph Nuthalapati
parent 80d67c2054
commit bff294ed39
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plinth/modules/storage/tests/test_storage.py
View File

@ -4,6 +4,7 @@ Test module for storage module operations.
"""
import os
import pathlib
import re
import subprocess
import tempfile
@ -204,14 +205,14 @@ class TestActions:
@staticmethod
def call_action(action_command, **kwargs):
"""Call the action script."""
current_directory = os.path.dirname(os.path.realpath(__file__))
action = os.path.join(current_directory, '..', '..', '..', '..',
'actions', action_command[0])
action_command[0] = action
test_directory = pathlib.Path(__file__).parent
top_directory = (test_directory / '..' / '..' / '..' / '..').resolve()
action_command[0] = top_directory / 'actions' / action_command[0]
kwargs['stdout'] = kwargs.get('stdout', subprocess.DEVNULL)
kwargs['stderr'] = kwargs.get('stderr', subprocess.DEVNULL)
kwargs['check'] = kwargs.get('check', True)
return subprocess.run(action_command, **kwargs)
env = dict(os.environ, PYTHONPATH=str(top_directory))
return subprocess.run(action_command, env=env, **kwargs)
def check_action(self, action_command):
"""Return success/failure result of the action command."""