Skip to content

Commit 065d1af

Browse files
Thomas KpenouThomas Kpenou
authored andcommitted
chore: merge master → stable (2026-06-17)
- chore(tests): add pytest.ini so tests run from project root - fix(test): await validate_user coroutine in test_validate_when_session_expired_after_renew - chore(deps): bump marked from ^4.1.0 to ^15.0.12 - chore(tests): suppress ldap3 DeprecationWarning from pyasn1 in pytest
2 parents 3a04f1c + 2ff30db commit 065d1af

7 files changed

Lines changed: 24 additions & 14 deletions

File tree

pytest.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[pytest]
2+
testpaths = src/tests
3+
pythonpath = src
4+
norecursedirs = src/e2e_tests
5+
filterwarnings =
6+
ignore::DeprecationWarning:ldap3

src/tests/auth/test_auth_abstract_oauth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def test_validate_when_session_expired_after_renew(self):
355355
username = yield authenticator.authenticate(request_handler)
356356

357357
mock_time.return_value = mock_time.return_value + 60 * 2
358-
authenticator.validate_user(username, request_handler)
358+
yield authenticator.validate_user(username, request_handler)
359359

360360
mock_time.return_value = mock_time.return_value + 60 * 6
361361
valid2 = yield authenticator.validate_user(username, request_handler)

src/tests/execution/process_pty_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import os
22
import threading
33
import unittest
4+
from pathlib import Path
45

56
from execution.process_pty import PtyProcessWrapper
67
from react.observable import read_until_closed
@@ -36,7 +37,7 @@ def test_custom_variables_when_hidden(self):
3637
def execute_and_get_passed_env(custom_variables):
3738
env_variables = test_utils.env_variables
3839
process_wrapper = PtyProcessWrapper(
39-
'tests/scripts/printenv.sh', '.', env_variables.build_env_vars(custom_variables))
40+
str(Path(__file__).parent.parent / 'scripts' / 'printenv.sh'), '.', env_variables.build_env_vars(custom_variables))
4041
process_wrapper.start()
4142
thread = threading.Thread(target=process_wrapper.wait_finish, daemon=True)
4243
thread.start()

src/tests/executor_test.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import os
22
import time
33
import unittest
4+
from pathlib import Path
45

56
from config.constants import PARAM_TYPE_MULTISELECT
67
from execution import executor
@@ -77,7 +78,7 @@ def test_env_variables_when_pty(self):
7778
with test_utils.custom_env('some_env', 'test'):
7879
config = create_config_model(
7980
'config_x',
80-
script_command='tests/scripts/printenv.sh',
81+
script_command=str(Path(__file__).parent / 'scripts' / 'printenv.sh'),
8182
requires_terminal=True,
8283
parameters=[
8384
create_script_param_config('id'),
@@ -104,7 +105,7 @@ def test_env_variables_when_popen(self):
104105
with test_utils.custom_env('some_env', 'test'):
105106
config = create_config_model(
106107
'config_x',
107-
script_command='tests/scripts/printenv.sh',
108+
script_command=str(Path(__file__).parent / 'scripts' / 'printenv.sh'),
108109
requires_terminal=False,
109110
parameters=[
110111
create_script_param_config('id'),

src/tests/process_popen_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import os
22
import unittest
3+
from pathlib import Path
34

45
from execution.process_popen import prepare_cmd_for_win, POpenProcessWrapper
56
from tests import test_utils
@@ -34,7 +35,7 @@ def test_PYTHONUNBUFFERED(self):
3435
def execute_and_get_passed_env(custom_variables):
3536
env_variables = test_utils.env_variables
3637
process_wrapper = POpenProcessWrapper(
37-
'tests/scripts/printenv.sh', '.', env_variables.build_env_vars(custom_variables))
38+
str(Path(__file__).parent / 'scripts' / 'printenv.sh'), '.', env_variables.build_env_vars(custom_variables))
3839
process_wrapper.start()
3940
output = test_utils.wait_and_read(process_wrapper)
4041
lines = output.split('\n')

web-src/package-lock.json

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web-src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"core-js": "^3.25.3",
1010
"dompurify": "^3.4.9",
1111
"lodash": "^4.18.1",
12-
"marked": "^4.1.0",
12+
"marked": "^15.0.12",
1313
"material-design-icons": "^3.0.1",
1414
"pinia": "^3.0.4",
1515
"tinycolor2": "^1.4.2",

0 commit comments

Comments
 (0)