From 6c81752e82ecf3964aae5a24c4efb8ec9d4e296d Mon Sep 17 00:00:00 2001 From: Eric Enns Date: Mon, 5 Dec 2022 11:42:41 -0600 Subject: [PATCH] chore: switch to chrome from chromium, and ensure irida base url is http://127.0.0.1:8080 --- irida_import/tests/integration/bash_scripts/install_galaxy.sh | 1 + irida_import/tests/integration/irida_data_setup.py | 1 + irida_import/tests/integration/test_irida_importer.py | 1 - irida_import/tests/integration/tests_integration.py | 3 +-- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/irida_import/tests/integration/bash_scripts/install_galaxy.sh b/irida_import/tests/integration/bash_scripts/install_galaxy.sh index 31517d09..528a4cfb 100755 --- a/irida_import/tests/integration/bash_scripts/install_galaxy.sh +++ b/irida_import/tests/integration/bash_scripts/install_galaxy.sh @@ -55,6 +55,7 @@ pushd galaxy/tools/irida-galaxy-importer/ cp irida_import/config.ini.sample irida_import/config.ini sed -i "s/^max_waits: .*$/max_waits: 1/" irida_import/config.ini sed -i "s|^galaxy_url: http://localhost:8888$|galaxy_url: http://127.0.0.1:$galaxy_port|" irida_import/config.ini +sed -i "s|^irida_url: http://localhost:8080$|irida_url: http://127.0.0.1:8080|" irida_import/config.ini echo "Configuring the tool's XML file" python -m irida_import.main --generate_xml diff --git a/irida_import/tests/integration/irida_data_setup.py b/irida_import/tests/integration/irida_data_setup.py index 9eb99d6d..8536f592 100644 --- a/irida_import/tests/integration/irida_data_setup.py +++ b/irida_import/tests/integration/irida_data_setup.py @@ -63,6 +63,7 @@ def __init__(self, base_url, user, password, branch, db_host, db_port, repo_dir) '--spring.datasource.url={} '.format(self.DB_JDBC_URL) +\ '--spring.datasource.username={} '.format(self.DB_USERNAME) +\ '--spring.datasource.password={} '.format(self.DB_PASSWORD) +\ + '--server.base.url=http://127.0.0.1:8080 ' +\ '--liquibase.update.database.schema=true ' +\ '--spring.jpa.hibernate.ddl-auto= ' +\ '--spring.jpa.properties.hibernate.hbm2ddl.import_files= ' +\ diff --git a/irida_import/tests/integration/test_irida_importer.py b/irida_import/tests/integration/test_irida_importer.py index 2e4f17c5..be9369d7 100644 --- a/irida_import/tests/integration/test_irida_importer.py +++ b/irida_import/tests/integration/test_irida_importer.py @@ -154,7 +154,6 @@ def _create_temp_file(file_name, file_contents): seq3 = _create_temp_file("seq3.fastq", fastq_contents) self.irida_session.post(sequences2, files={'file': open(seq3, 'rb')}) - import pdb; pdb.set_trace() # Export to Galaxy using the button on the dropdown menu self.driver.get(tests_integration.galaxy_url) history_panel = self.driver.find_element_by_id('current-history-panel') diff --git a/irida_import/tests/integration/tests_integration.py b/irida_import/tests/integration/tests_integration.py index d2639795..94b26717 100644 --- a/irida_import/tests/integration/tests_integration.py +++ b/irida_import/tests/integration/tests_integration.py @@ -5,7 +5,6 @@ from os import path from webdriver_manager.chrome import ChromeDriverManager -from webdriver_manager.core.utils import ChromeType from selenium.webdriver.chrome.options import Options as ChromeDriverOptions from irida_import.tests.integration.irida_data_setup import SetupIridaData @@ -26,7 +25,7 @@ repo_path = path.join('/tmp', 'repos') # Have ChromeDriverManager handle chrome installation and driver for compatibility with github actions -chrome_driver_path = ChromeDriverManager(chrome_type=ChromeType.CHROMIUM).install() +chrome_driver_path = ChromeDriverManager().install() chrome_driver_options = ChromeDriverOptions() # When creating new tests, these can be commented out to have driver window display chrome_driver_options.add_argument('--headless')