Unverified Commit 4225e4b0 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_24.2' into release_25.0

parents a8c7df70 4ea216f0

lib/galaxy_test/selenium/test_data_source_tools.py

+2 −0
Original line number Diff line number Diff line 
import pytest

from selenium.webdriver.support.ui import Select



from galaxy.util.unittest_utils import skip_if_site_down
@@ -12,6 +13,7 @@ from .framework import ( 
class TestDataSource(SeleniumTestCase, UsesHistoryItemAssertions):

    ensure_registered = True



    @pytest.mark.skip("Skipping UCSC table direct1 data source test, chromedriver fails captcha")

    @selenium_test

    @managed_history

    @skip_if_site_down("https://genome.ucsc.edu/cgi-bin/hgTables")

tools/data_source/data_source.py

+12 −7
Original line number Diff line number Diff line
@@ -8,7 +8,10 @@ from urllib.parse import ( 
    urlencode,

    urlparse,

)

from urllib.request import urlopen

from urllib.request import (

    Request,

    urlopen,

)



from galaxy.datatypes import sniff

from galaxy.datatypes.registry import Registry
@@ -17,6 +20,7 @@ from galaxy.util import ( 
    get_charset_from_http_headers,

    stream_to_open_named_file,

)

from galaxy.util.user_agent import get_default_headers



GALAXY_PARAM_PREFIX = "GALAXY"

GALAXY_ROOT_DIR = os.path.realpath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
@@ -51,15 +55,16 @@ def __main__(): 
            sys.exit("The remote data source application has not sent back a URL parameter in the request.")



        # The following calls to urlopen() will use the above default timeout

        headers = get_default_headers()

        try:

            if URL_method == "get":

                page = urlopen(cur_URL, timeout=DEFAULT_SOCKET_TIMEOUT)

                req = Request(cur_URL, headers=headers)

            elif URL_method == "post":

                page = urlopen(

                    cur_URL,

                    urlencode(params["param_dict"]["incoming_request_params"]).encode("utf-8"),

                    timeout=DEFAULT_SOCKET_TIMEOUT,

                )

                data = urlencode(params["param_dict"]["incoming_request_params"]).encode("utf-8")

                req = Request(cur_URL, data=data, headers=headers)

            else:

                raise Exception("Unknown URL_method specified: %s" % URL_method)

            page = urlopen(req, timeout=DEFAULT_SOCKET_TIMEOUT)

        except Exception as e:

            sys.exit("The remote data source application may be off line, please try again later. Error: %s" % str(e))

        if max_file_size: