Skip to content

Commit

Permalink
chore: switch to chrome from chromium, and ensure irida base url is h…
Browse files Browse the repository at this point in the history
  • Loading branch information
ericenns committed Dec 6, 2022
1 parent a4c0345 commit 6c81752
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions irida_import/tests/integration/irida_data_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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= ' +\
Expand Down
1 change: 0 additions & 1 deletion irida_import/tests/integration/test_irida_importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
3 changes: 1 addition & 2 deletions irida_import/tests/integration/tests_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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')
Expand Down

0 comments on commit 6c81752

Please sign in to comment.