Skip to content

31243 fix solr admin app ci #1941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahamood1 wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −4
Open

31243 fix solr admin app ci #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9208cf7
Fixed selenium web driver api issues. executable_path was removed in …
ahamood1 Dec 16, 2025
3e1fb03
Removed the skip test directive. SOLR_URL must be set or CI should fail.
ahamood1 Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions solr-admin-app/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import pytest
from selenium.webdriver.firefox.webdriver import WebDriver
from selenium.webdriver.firefox.options import Options
from selenium.webdriver.firefox.service import Service
from sqlalchemy import engine_from_config
from tests.external.support.driver.server_driver import ServerDriver

Expand All @@ -25,7 +26,8 @@ def get_browser():

options = Options()
options.headless = True
browser = WebDriver(options=options, executable_path=(gecko_driver()))
service = Service(executable_path=gecko_driver())
browser = WebDriver(options=options, service=service)

return browser

Expand Down Expand Up @@ -81,8 +83,8 @@ def base_url(port):

@pytest.fixture(scope="function")
def clean_db():
from flask_sqlalchemy import SQLAlchemy
from solr_admin import create_application
from solr_admin import models

from solr_admin.models.synonym import Synonym
from solr_admin.models.synonym_audit import SynonymAudit
Expand All @@ -103,7 +105,8 @@ def clean_db():
Keycloak._oidc = FakeOidc()
app, admin = create_application(run_mode='testing')

db = SQLAlchemy(app)
# Use the existing db instance that was initialized in create_application
db = models.db

synonyms_db = engine_from_config({'sqlalchemy.url': app.config['SQLALCHEMY_BINDS']['synonyms']})
#Synonym.metadata.drop_all(bind=synonyms_db)
Expand Down
4 changes: 3 additions & 1 deletion solr-admin-app/tests/external/test_not_authorized_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from hamcrest import *
from selenium.webdriver.firefox.webdriver import WebDriver
from selenium.webdriver.firefox.options import Options
from selenium.webdriver.firefox.service import Service

from tests.conftest import get_browser, connect_with, gecko_driver
import os
Expand Down Expand Up @@ -35,7 +36,8 @@ def new_browser(new_server, second_base_url):
def get_browser():
options = Options()
options.headless = True
browser = WebDriver(options=options, executable_path=(gecko_driver()))
service = Service(executable_path=gecko_driver())
browser = WebDriver(options=options, service=service)

return browser

Expand Down
1 change: 1 addition & 0 deletions solr-admin-app/tests/internal/services/test_stem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import pytest

from hamcrest import *
from solr_admin.services.get_stems import get_stems, get_stems_url
Expand Down
Loading