Skip to content

Refactor tests runner script to use dbus-launch instead of dbus-daemon #38

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

Merged
merged 2 commits into from
Dec 18, 2016
Merged

Refactor tests runner script to use dbus-launch instead of dbus-daemon #38

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
f4787f9
Refactor tests runner script to use dbus-launch instead of dbus-daemon
acaso Dec 9, 2016
9194f40
Add dbus-x11 installation to docker testing machines to have dbus-lau…
acaso Dec 10, 2016
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
2 changes: 1 addition & 1 deletion tests/py2.7-ubuntu-14.04.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:14.04
RUN apt-get update

RUN apt-get install -y dbus python-gi python-pip psmisc python-dev
RUN apt-get install -y dbus python-gi python-pip psmisc python-dev dbus-x11
RUN python2 --version
RUN pip2 install greenlet

Expand Down
2 changes: 1 addition & 1 deletion tests/py2.7-ubuntu-16.04.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:16.04
RUN apt-get update

RUN apt-get install -y dbus python-gi python-pip psmisc
RUN apt-get install -y dbus python-gi python-pip psmisc dbus-x11
RUN python2 --version
RUN pip2 install greenlet

Expand Down
2 changes: 1 addition & 1 deletion tests/py3.4-ubuntu-14.04.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:14.04
RUN apt-get update

RUN apt-get install -y dbus python3-gi python3-pip psmisc python3-dev
RUN apt-get install -y dbus python3-gi python3-pip psmisc python3-dev dbus-x11
RUN python3 --version
RUN pip3 install greenlet

Expand Down
2 changes: 1 addition & 1 deletion tests/py3.5-ubuntu-16.04.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:16.04
RUN apt-get update

RUN apt-get install -y dbus python3-gi python3-pip psmisc
RUN apt-get install -y dbus python3-gi python3-pip psmisc dbus-x11
RUN python3 --version
RUN pip3 install greenlet

Expand Down
12 changes: 2 additions & 10 deletions tests/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
#!/bin/sh
set -e

ADDRESS_FILE=$(mktemp /tmp/pydbustest.XXXXXXXXX)
PID_FILE=$(mktemp /tmp/pydbustest.XXXXXXXXX)
eval `dbus-launch --sh-syntax`

dbus-daemon --session --print-address=0 --print-pid=1 --fork 0>"$ADDRESS_FILE" 1>"$PID_FILE"

export DBUS_SESSION_BUS_ADDRESS=$(cat "$ADDRESS_FILE")
PID=$(cat "$PID_FILE")

trap 'kill -TERM $PID' EXIT

rm "$ADDRESS_FILE" "$PID_FILE"
trap 'kill -TERM $DBUS_SESSION_BUS_PID' EXIT

PYTHON=${1:-python}

Expand Down