opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix selenium populators to respect the json parameter.

Browse Source 
Mirror behavior of the original request calls in the non-Selenium interactor - e.g. https://github.com/galaxyproject/galaxy/blob/dev/lib/galaxy/tool_util/verify/interactor.py#L747
This commit is contained in:
John Chilton
2021-10-04 11:31:56 -04:00
parent bf3b6cd6f0
commit b4a8d7a246
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy_test/selenium/framework.py
+14 -3
View File
@@ -6,6 +6,7 @@ import os
import traceback
import unittest
from functools import partial, wraps
from typing import Any, Dict
import requests
from gxformat2 import (
@@ -580,7 +581,8 @@ class SeleniumSessionGetPostMixin:
full_url = f"{full_url}?key={self._mixin_admin_api_key}"
else:
cookies = self.selenium_context.selenium_to_requests_cookies()
response = requests.post(full_url, data=data, cookies=cookies, files=files, headers=headers, timeout=DEFAULT_SOCKET_TIMEOUT)
request_kwd = self._prepare_request_data(dict(cookies=cookies, headers=headers, timeout=DEFAULT_SOCKET_TIMEOUT, files=files), data, as_json=json)
response = requests.post(full_url, **request_kwd)
return response
def _delete(self, route, data=None, headers=None, admin=False, json: bool = False) -> Response:
@@ -591,7 +593,8 @@ class SeleniumSessionGetPostMixin:
full_url = f"{full_url}?key={self._mixin_admin_api_key}"
else:
cookies = self.selenium_context.selenium_to_requests_cookies()
response = requests.delete(full_url, data=data, cookies=cookies, headers=headers, timeout=DEFAULT_SOCKET_TIMEOUT)
request_kwd = self._prepare_request_data(dict(cookies=cookies, headers=headers, timeout=DEFAULT_SOCKET_TIMEOUT), data, as_json=json)
response = requests.delete(full_url, **request_kwd)
return response
def _put(self, route, data=None, headers=None, admin=False, json: bool = False) -> Response:
@@ -602,9 +605,17 @@ class SeleniumSessionGetPostMixin:
full_url = f"{full_url}?key={self._mixin_admin_api_key}"
else:
cookies = self.selenium_context.selenium_to_requests_cookies()
response = requests.put(full_url, data=data, cookies=cookies, headers=headers, timeout=DEFAULT_SOCKET_TIMEOUT)
request_kwd = self._prepare_request_data(dict(cookies=cookies, headers=headers, timeout=DEFAULT_SOCKET_TIMEOUT), data, as_json=json)
response = requests.put(full_url, **request_kwd)
return response
def _prepare_request_data(self, request_kwd: Dict[str, Any], data: Dict[str, Any], as_json: bool = False):
if as_json:
request_kwd['json'] = data
else:
request_kwd['data'] = data
return request_kwd
class SeleniumSessionDatasetPopulator(SeleniumSessionGetPostMixin, populators.BaseDatasetPopulator):