Skip to content
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

testing: add xvfb-run so we have a proper x environment, and remove a trailing processEvents call #137

Open
wants to merge 2 commits into
base: ian/fix-tests
Choose a base branch
from
Open

testing: add xvfb-run so we have a proper x environment, and remove a trailing processEvents call #137

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
4725457
testing: add xvfb-run so we have a proper x environment, and remove a…
ianohara Mar 3, 2025
11f3916
apt update needed
ianohara Mar 3, 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
6 changes: 5 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ jobs:
large-packages: true
docker-images: true
swap-storage: true
# Some of our tests are headless gui tests, but we still need a proper virtual display
# environment. We use xvfb for this.
- name: Install xvfb (for gui testing environment)
run: sudo apt update && sudo apt install -y xvfb
- name: Checkout the Squid repo
uses: actions/checkout@v4
- name: Run the setup script for Ubuntu 22.04
Expand All @@ -35,5 +39,5 @@ jobs:
run: cp configurations/configuration_Squid+.ini .
working-directory: ./software
- name: Run the tests
run: python3 -m pytest
run: xvfb-run python3 -m pytest
working-directory: ./software
1 change: 0 additions & 1 deletion software/control/core/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2545,7 +2545,6 @@ def _on_acquisition_completed(self):
self.acquisitionFinished.emit()
if not self.abort_acqusition_requested:
self.signal_stitcher.emit(os.path.join(self.base_path, self.experiment_ID))
QApplication.processEvents()

def request_abort_aquisition(self):
self.abort_acqusition_requested = True
Expand Down
Loading