tests: cleanup, remove sleep/print

This commit is contained in:
Daniel Hahler 2015-07-18 15:03:43 +02:00
parent f4ed41b39a
commit 2c3c6b5ca8
2 changed files with 2 additions and 10 deletions

View File

@ -42,19 +42,13 @@ SIZE=1024x768
if [ $HEADLESS = 1 ]; then if [ $HEADLESS = 1 ]; then
"$XVFB" $D -screen 0 ${SIZE}x24 & "$XVFB" $D -screen 0 ${SIZE}x24 &
xserver_pid=$! xserver_pid=$!
sleep 1
else else
# export XEPHYR_PAUSE=1000 # export XEPHYR_PAUSE=1000
# if [ -f /tmp/.X5-lock ]; then
# echo "Xephyr is already running for display $D.. aborting." >&2
# exit 1
# fi
"$XEPHYR" $D -ac -name xephyr_$D -noreset -screen "$SIZE" $XEPHYR_OPTIONS & "$XEPHYR" $D -ac -name xephyr_$D -noreset -screen "$SIZE" $XEPHYR_OPTIONS &
xserver_pid=$! xserver_pid=$!
sleep 1 # Toggles debugging mode, using XEPHYR_PAUSE.
# ( sleep 1; kill -USR1 $xserver_pid ) &
fi fi
# Toggles debugging mode, using XEPHYR_PAUSE.
# pkill -USR1 Xephyr
# Use a separate D-Bus session; sets $DBUS_SESSION_BUS_PID. # Use a separate D-Bus session; sets $DBUS_SESSION_BUS_PID.
eval $(DISPLAY="$D" dbus-launch --sh-syntax --exit-with-session) eval $(DISPLAY="$D" dbus-launch --sh-syntax --exit-with-session)
@ -68,7 +62,6 @@ XDG_CONFIG_HOME="./"
export LUA_PATH export LUA_PATH
export XDG_CONFIG_HOME export XDG_CONFIG_HOME
# awesome_log=$(mktemp)
awesome_log=/tmp/_awesome_test.log awesome_log=/tmp/_awesome_test.log
echo "awesome_log: $awesome_log" echo "awesome_log: $awesome_log"

View File

@ -21,7 +21,6 @@ local steps = {
else else
local c = client.get()[1] local c = client.get()[1]
if c then if c then
print(c.border_color)
assert(c.border_color == "#ff0000") assert(c.border_color == "#ff0000")
return true return true
end end