Skip to content

Commit

Permalink
testing: reenable ipc tests in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mattkae committed Dec 3, 2024
1 parent 0dfdc5f commit 24f4a13
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ jobs:
libmiroil-dev libmirrenderer-dev libgles2-mesa-dev libmirwayland-dev libjson-c-dev
sudo apt install mir-platform-graphics-virtual xwayland \
mir-platform-graphics-gbm-kms mir-platform-rendering-egl-generic gedit gnome-chess
mir-platform-graphics-gbm-kms mir-platform-rendering-egl-generic gedit gnome-chess \
libwayland-dev gnome-calculator
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
Expand All @@ -50,11 +51,11 @@ jobs:
run: cd ${{github.workspace}}/build && ./bin/miracle-wm-tests

- name: IPC Tests
if: false
run: |
export NO_AT_BRIDGE=1
sudo systemd-run --uid 1001 -p Environment=XDG_SESSION_TYPE=wayland -p PAMName=login -p TTYPath=/dev/tty1 -- tail -f /dev/null
cd ${{github.workspace}}/tests/ipc
python -m venv venv
source venv/bin/activate
pip install -r requirements.txt
MIRACLE_IPC_TEST_BIN=/usr/local/bin/miracle-wm pytest -s
Expand Down
10 changes: 5 additions & 5 deletions tests/ipc/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def server():
with process.stdout:
for line in iter(process.stdout.readline, b''):
data = line.decode("utf-8").strip()
# print(data)
print(data)
if to_find in data:
i = data.index(to_find)
i = i + len(to_find)
Expand All @@ -46,9 +46,9 @@ def server():

yield Server(socket, env["WAYLAND_DISPLAY"])

# for line in iter(process.stdout.readline, b''):
# data = line.decode("utf-8").strip()
# print(data)
for line in iter(process.stdout.readline, b''):
data = line.decode("utf-8").strip()
print(data)

process.terminate()
return
Expand Down Expand Up @@ -80,4 +80,4 @@ def multi_win_server():
# print(data)

process.terminate()
return
return

0 comments on commit 24f4a13

Please sign in to comment.