Tests: pathlib used where appropriate

Also fixed various pylint errors and style issues.
This commit is contained in:
Andrei Zeliankou
2024-01-15 15:48:58 +00:00
parent e95a91cbfa
commit 5a8337933d
72 changed files with 306 additions and 256 deletions

View File

@@ -1,4 +1,5 @@
import pytest
from unit.option import option

View File

@@ -1,5 +1,5 @@
import json
import os
from pathlib import Path
from unit.applications.lang.go import ApplicationGo
from unit.applications.lang.java import ApplicationJava
@@ -145,11 +145,12 @@ def check_isolation():
isolation = {'user': userns}
unp_clone_path = '/proc/sys/kernel/unprivileged_userns_clone'
if os.path.exists(unp_clone_path):
with open(unp_clone_path, 'r') as f:
if str(f.read()).rstrip() == '1':
isolation['unprivileged_userns_clone'] = True
path_clone = Path('/proc/sys/kernel/unprivileged_userns_clone')
if (
path_clone.exists()
and path_clone.read_text(encoding='utf-8').rstrip() == '1'
):
isolation['unprivileged_userns_clone'] = True
for ns in allns:
ns_value = getns(ns)

View File

@@ -1,11 +1,11 @@
import os
import subprocess
from pathlib import Path
from unit.option import option
def check_node():
if not os.path.exists(f'{option.current_dir}/node/node_modules'):
if not Path(f'{option.current_dir}/node/node_modules').exists():
return False
try: