Skip to content

Commit

Permalink
test: fix code
Browse files Browse the repository at this point in the history
  • Loading branch information
saw-jan committed Sep 16, 2024
1 parent 076766b commit d7480f0
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 17 deletions.
10 changes: 9 additions & 1 deletion test/gui/.pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,15 @@ fail-under=10
ignore-paths=^tst_.*/test.py$,
shared/scripts/names.py,
shared/scripts/custom_lib
ignored-modules=squish,object,objectmaphelper,test
ignored-modules=
squish,
object,
objectmaphelper,
test,
requests,
psutil,
urllib3,
custom_lib.syncstate,
load-plugins=
pylint.extensions.check_elif,
pylint.extensions.bad_builtin,
Expand Down
2 changes: 1 addition & 1 deletion test/gui/shared/scripts/helpers/SetupClientHelper.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from os import makedirs
from os.path import exists, join
import test
import psutil # pylint: disable=import-error
import psutil
import squish

from helpers.SpaceHelper import get_space_id
Expand Down
2 changes: 1 addition & 1 deletion test/gui/shared/scripts/helpers/SyncHelper.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# if the IDE fails to reference the script,
# add the folder in Edit->Preferences->PyDev->Interpreters->Libraries
sys.path.append(custom_lib)
from custom_lib.syncstate import SocketConnect # pylint: disable=import-error
from custom_lib.syncstate import SocketConnect

# socket messages
socket_messages = []
Expand Down
2 changes: 1 addition & 1 deletion test/gui/shared/scripts/helpers/UserHelper.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def basic_auth_header(user=None, password=None):

def getUserInfo(username, attribute):
if username in test_users:
return test_users[username][attribute]
return getattr(test_users[username], attribute)
if attribute == "password":
return get_default_password()
raise ValueError(f"Invalid user attribute: {attribute}")
Expand Down
4 changes: 2 additions & 2 deletions test/gui/shared/scripts/helpers/WebUIHelper.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ def authorize_via_webui(username, password, login_type='oidc'):
'OC_AUTH_URL': getClipboardText(),
}
proc = subprocess.run(
f'pnpm run {login_type}-login' % login_type,
f'pnpm run {login_type}-login',
capture_output=True,
shell=True,
env={**os.environ, **envs},
check=False,
)
if not proc.returncode:
if proc.returncode:
if proc.stderr.decode('utf-8'):
raise OSError(proc.stderr.decode('utf-8'))
raise OSError(proc.stdout.decode('utf-8'))
Expand Down
6 changes: 4 additions & 2 deletions test/gui/shared/scripts/helpers/api/http_helper.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import requests # pylint: disable=import-error
import urllib3 # pylint: disable=import-error
import requests
import urllib3

from helpers.UserHelper import basic_auth_header
from helpers.ConfigHelper import get_config
Expand All @@ -9,6 +9,8 @@

def send_request(url, method, body=None, headers=None, user=None, password=None):
auth_header = basic_auth_header(user, password)
if not headers:
headers = {}
headers.update(auth_header)
return requests.request(
method,
Expand Down
23 changes: 14 additions & 9 deletions test/gui/shared/scripts/helpers/api/provisioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,29 @@ def add_user_to_group(user, group_name):


def create_user(username):
user = {}
if username in UserHelper.test_users:
user = UserHelper.test_users[username]
else:
user = {
'username': username,
'displayname': username,
'email': f'{username}@mail.com',
'password': UserHelper.get_default_password(),
}
user = UserHelper.User(
username=username,
displayname=username,
email=f'{username}@mail.com',
password=UserHelper.get_default_password(),
)

if get_config('ocis'):
user_info = ocis.create_user(
user['username'], user['password'], user['displayname'], user['email']
user.username,
user.password,
user.displayname,
user.email,
)
else:
user_info = oc.create_user(
user['username'], user['password'], user['displayname'], user['email']
user.username,
user.password,
user.displayname,
user.email,
)
created_users[username] = user_info

Expand Down

0 comments on commit d7480f0

Please sign in to comment.