technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tests: pathlib used where appropriate

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
test/unit/applications/lang/go.py
View File

@@ -53,7 +53,7 @@ class ApplicationGo(ApplicationProto):
replace_path = f'{option.current_dir}/build/go/src/unit.nginx.org/go'
with open(f'{temp_dir}go.mod', 'w') as f:
with open(f'{temp_dir}go.mod', 'w', encoding='utf-8') as f:
f.write(
f"""module test/app
require unit.nginx.org/go v0.0.0

7
test/unit/applications/lang/php.py
View File

@@ -1,4 +1,4 @@
import os
from pathlib import Path
import shutil
from unit.applications.proto import ApplicationProto
@@ -15,10 +15,9 @@ class ApplicationPHP(ApplicationProto):
if kwargs.get('isolation') and kwargs['isolation'].get('rootfs'):
rootfs = kwargs['isolation']['rootfs']
if not os.path.exists(f'{rootfs}/app/php/'):
os.makedirs(f'{rootfs}/app/php/')
Path(f'{rootfs}/app/php/').mkdir(parents=True, exist_ok=True)
if not os.path.exists(f'{rootfs}/app/php/{script}'):
if not Path(f'{rootfs}/app/php/{script}').exists():
shutil.copytree(script_path, f'{rootfs}/app/php/{script}')
script_path = f'/app/php/{script}'

7
test/unit/applications/lang/python.py
View File

@@ -1,4 +1,4 @@
import os
from pathlib import Path
import shutil
from urllib.parse import quote
@@ -26,10 +26,9 @@ class ApplicationPython(ApplicationProto):
if kwargs.get('isolation') and kwargs['isolation'].get('rootfs'):
rootfs = kwargs['isolation']['rootfs']
if not os.path.exists(f'{rootfs}/app/python/'):
os.makedirs(f'{rootfs}/app/python/')
Path(f'{rootfs}/app/python/').mkdir(parents=True, exist_ok=True)
if not os.path.exists(f'{rootfs}/app/python/{name}'):
if not Path(f'{rootfs}/app/python/{name}').exists():
shutil.copytree(script_path, f'{rootfs}/app/python/{name}')
script_path = f'/app/python/{name}'

2
test/unit/applications/tls.py
View File

@@ -79,7 +79,7 @@ subjectAltName = @alt_names
{a_names}'''
with open(conf_path, 'w') as f:
with open(conf_path, 'w', encoding='utf-8') as f:
f.write(
f'''[ req ]
default_bits = 2048

13
test/unit/applications/websockets.py
View File

@@ -6,6 +6,7 @@ import select
import struct
import pytest
from unit.applications.proto import ApplicationProto
GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
@@ -69,7 +70,7 @@ class ApplicationWebsocket(ApplicationProto):
return struct.pack('!H', code) + reason.encode('utf-8')
def frame_read(self, sock, read_timeout=60):
def recv_bytes(sock, bytes):
def recv_bytes(sock, bytes_len):
data = b''
while True:
rlist = select.select([sock], [], [], read_timeout)[0]
@@ -80,9 +81,9 @@ class ApplicationWebsocket(ApplicationProto):
pytest.fail("Can't read response from server.")
break
data += sock.recv(bytes - len(data))
data += sock.recv(bytes_len - len(data))
if len(data) == bytes:
if len(data) == bytes_len:
break
return data
@@ -206,18 +207,18 @@ class ApplicationWebsocket(ApplicationProto):
end = frame_len
pos = end
def message(self, sock, type, message, fragmention_size=None, **kwargs):
def message(self, sock, mes_type, message, fragmention_size=None, **kwargs):
message_len = len(message)
if fragmention_size is None:
fragmention_size = message_len
if message_len <= fragmention_size:
self.frame_write(sock, type, message, **kwargs)
self.frame_write(sock, mes_type, message, **kwargs)
return
pos = 0
op_code = type
op_code = mes_type
while pos < message_len:
end = min(pos + fragmention_size, message_len)
fin = end == message_len