Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1361a54

Browse files
committedJul 14, 2016
Add test to check in-session greeter doesn't open a new session when unlocking active session
1 parent 2f5ff1e commit 1361a54

File tree

3 files changed

+49
-1
lines changed

3 files changed

+49
-1
lines changed
 

‎tests/Makefile.am

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ TESTS = \
169169
test-switch-to-users \
170170
test-session-greeter \
171171
test-session-greeter-autologin \
172-
test-session-greeter-reconnect \
172+
test-session-greeter-reconnect \
173+
test-session-greeter-unlock \
173174
test-vnc-login \
174175
test-vnc-command \
175176
test-vnc-dimensions \
@@ -545,6 +546,7 @@ EXTRA_DIST = \
545546
scripts/session-greeter.conf \
546547
scripts/session-greeter-autologin.conf \
547548
scripts/session-greeter-reconnect.conf \
549+
scripts/session-greeter-unlock.conf \
548550
scripts/session-stdout.conf \
549551
scripts/session-stderr.conf \
550552
scripts/session-stderr-multi-write.conf \
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#
2+
# Check can unlock user with an in-session greeter
3+
#
4+
5+
[Seat:*]
6+
autologin-user=have-password1
7+
user-session=greeter
8+
9+
#?*START-DAEMON
10+
#?RUNNER DAEMON-START
11+
12+
# X server starts
13+
#?XSERVER-0 START VT=7 SEAT=seat0
14+
15+
# Daemon connects when X server is ready
16+
#?*XSERVER-0 INDICATE-READY
17+
#?XSERVER-0 INDICATE-READY
18+
#?XSERVER-0 ACCEPT-CONNECT
19+
20+
# Session starts
21+
#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=greeter USER=have-password1
22+
#?LOGIN1 ACTIVATE-SESSION SESSION=c0
23+
#?XSERVER-0 ACCEPT-CONNECT
24+
#?SESSION-X-0 CONNECT-XSERVER
25+
26+
# Start greeter inside session
27+
#?*SESSION-X-0 GREETER-START
28+
#?SESSION-X-0 GREETER-STARTED
29+
30+
# Log into our account
31+
#?*SESSION-X-0 GREETER-AUTHENTICATE USERNAME=have-password1
32+
#?SESSION-X-0 GREETER-SHOW-PROMPT TEXT="Password:"
33+
#?*SESSION-X-0 GREETER-RESPOND TEXT="password"
34+
#?SESSION-X-0 GREETER-AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
35+
#?*SESSION-X-0 GREETER-START-SESSION
36+
37+
# We are reactivated
38+
#?LOGIN1 ACTIVATE-SESSION SESSION=c0
39+
40+
# Cleanup
41+
#?*STOP-DAEMON
42+
#?SESSION-X-0 TERMINATE SIGNAL=15
43+
#?XSERVER-0 TERMINATE SIGNAL=15
44+
#?RUNNER DAEMON-EXIT STATUS=0

‎tests/test-session-greeter-unlock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
./src/dbus-env ./src/test-runner session-greeter-unlock test-gobject-greeter

0 commit comments

Comments
 (0)
Please sign in to comment.