diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index adf772c2b..75a8b38c5 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -112,7 +112,15 @@ jobs: cd ermresolve sudo pip3 install . sudo useradd --create-home --system ermresolve - : # sudo cp ../chaise/test/wsgi_ermresolve.conf /etc/apache2/conf.d/wsgi_ermresolve.conf + sudo cp ../chaise/test/wsgi_ermresolve.conf /etc/apache2/conf.d/wsgi_ermresolve.conf + echo "zero:" + sudo ls -l etc/apache2/conf.d/ + echo "first:" + sudo ls -l /usr/lib/python3.10/ + echo "second:" + sudo ls -l /usr/lib/python3.10/site-packages + echo "third:" + sudo ls -l /usr/local/lib/python3.10/dist-packages sudo chmod og+rx /home/ermresolve sudo service apache2 restart - name: Install ermrestjs diff --git a/test/e2e/specs/all-features-confirmation/navbar/no-logo.spec.ts b/test/e2e/specs/all-features-confirmation/navbar/no-logo.spec.ts index 1e49a4217..c102a8758 100644 --- a/test/e2e/specs/all-features-confirmation/navbar/no-logo.spec.ts +++ b/test/e2e/specs/all-features-confirmation/navbar/no-logo.spec.ts @@ -117,7 +117,7 @@ test.describe('Navbar', () => { await newPage.waitForLoadState('domcontentloaded'); const url = newPage.url(); console.log(`url is ${url}`); - await newPage.waitForURL(`**/recordset/#${getCatalogID(testInfo.project.name)}/isa:dataset**`); + await newPage.waitForURL(`**/recordset/#${getCatalogID(testInfo.project.name)}/isa:dataset**`, { waitUntil: 'domcontentloaded' }); await newPage.close(); }); }); diff --git a/test/wsgi_ermresolve.conf b/test/wsgi_ermresolve.conf index de428094a..57e05af9e 100644 --- a/test/wsgi_ermresolve.conf +++ b/test/wsgi_ermresolve.conf @@ -3,7 +3,7 @@ WSGIPythonOptimize 1 WSGIDaemonProcess ermresolve processes=1 threads=4 user=ermresolve maximum-requests=2000 WSGIScriptAlias /id /usr/lib/python3.10/site-packages/ermresolve/ermresolve.wsgi process-group=ermresolve -WSGISocketPrefix /var/run/httpd/wsgi +WSGISocketPrefix /var/run/apache2/wsgi Require all granted