Commit c1a24e30 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

async-new-presentation is now implemented. Expect bug 178.

parent 83d9bc6d
......@@ -46,7 +46,7 @@ client_start 5
send "A[holl "five"]\n"
simple_expect "LysKOM" "connected"
send "1000 80 1 { 20 }\n"
good_bad_expect "=1000" "%50 20" "Bug 904"
good_bad_expect "=1000" "%50 20"
send "1001 0 5 [holl "gazonk"]\n"
simple_expect "=1001"
send "1002 42 255\n"
......@@ -57,7 +57,7 @@ client_start 6
send "A[holl "six"]\n"
simple_expect "LysKOM" "connected"
send "1003 80 1 { 20 }\n"
good_bad_expect "=1003" "%50 20" "Bug 904"
good_bad_expect "=1003" "%50 20"
send "1004 89 [holl "super"] [holl "super"] 00000000 0 { }\n"
simple_expect "=1004 6"
send "1005 0 6 [holl "super"]\n"
......@@ -68,7 +68,7 @@ client_start 7
send "A[holl "seven"]\n"
simple_expect "LysKOM" "connected"
send "1006 80 1 { 20 }\n"
good_bad_expect "=1006" "%50 20" "Bug 904"
good_bad_expect "=1006" "%50 20"
send "1007 89 [holl "member"] [holl "member"] 00000000 0 { }\n"
simple_expect "=1007 7"
send "1008 0 7 [holl "member"]\n"
......@@ -79,7 +79,7 @@ client_start 8
send "A[holl "eight"]\n"
simple_expect "LysKOM" "connected"
send "1009 80 1 { 20 }\n"
good_bad_expect "=1009" "%50 20" "Bug 904"
good_bad_expect "=1009" "%50 20"
send "1010 89 [holl "bystander"] [holl "bystander"] 00000000 0 { }\n"
simple_expect "=1010 8"
send "1011 0 8 [holl "bystander"]\n"
......@@ -122,28 +122,36 @@ simple_expect "=1023 4"
# Set text 1 as presentation of conference 9.
send "1024 16 9 1\n"
##simple_expect ":3 20 9 0 1"
##client_expect 5 ":3 20 9 0 1"
##client_expect 7 ":3 20 9 0 1"
##client_expect 8 ":3 20 9 0 1"
simple_expect ":3 20 9 0 1"
client_expect 5 ":3 20 9 0 1"
client_expect 7 ":3 20 9 0 1"
client_expect 8 ":3 20 9 0 1"
simple_expect "=1024"
# Set text 2 as presentation of conference 9.
send "1025 16 9 2\n"
##simple_expect ":3 20 9 1 2"
##client_expect 5 ":3 20 9 1 2"
##client_expect 7 ":3 20 9 1 2"
##client_expect 8 ":3 20 9 1 2"
simple_expect ":3 20 9 1 2"
client_expect 5 ":3 20 9 1 2"
client_expect 7 ":3 20 9 1 2"
client_expect 8 ":3 20 9 1 2"
simple_expect "=1025"
# Set text 3 as presentation of conference 9. Since it isn't visible
# to the bystander, the bystander will think the presentation has been
# removed.
send "1026 16 9 3\n"
##simple_expect ":3 20 9 2 3"
##client_expect 5 ":3 20 9 2 3"
##client_expect 7 ":3 20 9 2 3"
##client_expect 8 ":3 20 9 2 0"
simple_expect ":3 20 9 2 3"
client_extracting_expect 5 ":3 20 9 2 (0|3)" seen 1
setup_xfail "*-*-*" "Bug 178"
set test "administrator sees proper text"
if {$seen == 3} {
pass "$test"
} else {
fail "$test (filtered)"
}
unset test
client_expect 7 ":3 20 9 2 3"
client_expect 8 ":3 20 9 2 0"
simple_expect "=1026"
# Set text 4 as presentation of conference 9. This text is also not
......@@ -151,9 +159,14 @@ simple_expect "=1026"
# presentation changes from 0 to 0. That is no change, so no async
# message is sent to the bystander.
send "1027 16 9 4\n"
##simple_expect ":3 20 9 2 4"
##client_expect 5 ":3 20 9 2 4"
##client_expect 7 ":3 20 9 2 4"
simple_expect ":3 20 9 3 4"
# FIXME (bug 178): Due to bug 178, this message never appears.
#client_expect 5 ":3 20 9 3 4"
setup_xfail "*-*-*" "Bug 178"
fail "admin sees message"
client_expect 7 ":3 20 9 3 4"
simple_expect "=1027"
# View the conf-stat of conference 9.
......@@ -184,31 +197,44 @@ unset test
# Set text 1 as presentation of conference 10.
talk_to client 6
send "1032 16 10 1\n"
##simple_expect ":3 20 10 0 1"
##client_expect 5 ":3 20 10 0 1"
##client_expect 7 ":3 20 10 0 1"
simple_expect ":3 20 10 0 1"
client_expect 5 ":3 20 10 0 1"
client_expect 7 ":3 20 10 0 1"
simple_expect "=1032"
# Set text 2 as presentation of conference 10.
send "1033 16 10 2\n"
##simple_expect ":3 20 10 1 2"
##client_expect 5 ":3 20 10 1 2"
##client_expect 7 ":3 20 10 1 2"
simple_expect ":3 20 10 1 2"
client_expect 5 ":3 20 10 1 2"
client_expect 7 ":3 20 10 1 2"
simple_expect "=1033"
# Set text 3 as presentation of conference 10.
# removed.
send "1034 16 10 3\n"
##simple_expect ":3 20 10 2 3"
##client_expect 5 ":3 20 10 2 3"
##client_expect 7 ":3 20 10 2 3"
simple_expect ":3 20 10 2 3"
client_extracting_expect 5 ":3 20 10 2 (0|3)" seen 1
setup_xfail "*-*-*" "Bug 178"
set test "administrator sees proper text"
if {$seen == 3} {
pass "$test"
} else {
fail "$test (filtered)"
}
unset test
client_expect 7 ":3 20 10 2 3"
simple_expect "=1034"
# Set text 4 as presentation of conference 10.
send "1035 16 10 4\n"
##simple_expect ":3 20 10 2 4"
##client_expect 5 ":3 20 10 2 4"
##client_expect 7 ":3 20 10 2 4"
simple_expect ":3 20 10 3 4"
# FIXME (bug 178): Due to bug 178, this message never appears.
#client_expect 5 ":3 20 10 3 4"
setup_xfail "*-*-*" "Bug 178"
fail "admin sees message"
client_expect 7 ":3 20 10 3 4"
simple_expect "=1035"
# View the conf-stat of conference 10.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment