YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dev' into code-cleanup

Browse source
This commit is contained in:
Alexandre Aubin 2020-09-06 22:16:06 +02:00 • committed by GitHub
commit 4c75620ee9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/hooks/diagnosis/50-systemresources.py
View file

@ -118,7 +118,7 @@ class SystemResourcesDiagnoser(Diagnoser):
def analyzed_kern_log():
cmd = 'tail -n 10000 /var/log/kern.log | grep "oom_reaper: reaped process"'
cmd = 'tail -n 10000 /var/log/kern.log | grep "oom_reaper: reaped process" || true'
out = subprocess.check_output(cmd, shell=True)
lines = out.strip().split("\n")

2
src/yunohost/tests/test_backuprestore.py
View file

@ -62,7 +62,7 @@ def setup_function(function):
if "with_permission_app_installed" in markers:
assert not app_is_installed("permissions_app")
user_create("alice", "Alice", "White", "alice@" + maindomain, "test123Ynh")
user_create("alice", "Alice", "White", maindomain, "test123Ynh")
install_app("permissions_app_ynh", "/urlpermissionapp"
"&admin=alice")
assert app_is_installed("permissions_app")

6
src/yunohost/tests/test_permission.py
View file

@ -55,9 +55,9 @@ def setup_function(function):
return res
socket.getaddrinfo = new_getaddrinfo
user_create("alice", "Alice", "White", "alice@" + maindomain, dummy_password)
user_create("bob", "Bob", "Snow", "bob@" + maindomain, dummy_password)
permission_create("wiki.main", url="/", allowed=["all_users"], sync_perm=False)
user_create("alice", "Alice", "White", maindomain, dummy_password)
user_create("bob", "Bob", "Snow", maindomain, dummy_password)
permission_create("wiki.main", url="/", allowed=["all_users"] , sync_perm=False)
permission_create("blog.main", allowed=["all_users"], sync_perm=False)
user_permission_update("blog.main", remove="all_users", add="alice")