Add an optional barrier to deal with a closed start menu. Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx> --- client/tests/kvm/steps/WinXP-32-setupssh.steps | 10 ++++++++-- client/tests/kvm/steps/WinXP-32.steps | 4 +++- client/tests/kvm/steps/WinXP-64.steps | 3 +-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/client/tests/kvm/steps/WinXP-32-setupssh.steps b/client/tests/kvm/steps/WinXP-32-setupssh.steps index 729d9df..ebb665f 100644 --- a/client/tests/kvm/steps/WinXP-32-setupssh.steps +++ b/client/tests/kvm/steps/WinXP-32-setupssh.steps @@ -4,8 +4,14 @@ # -------------------------------- step 24.72 screendump 20080101_000001_5965948293222a6d6f3e545db40c23c1.ppm -# open start menu -barrier_2 125 79 342 270 368b3d82c870dbcdc4dfc2a49660e798 124 +# desktop reached +barrier_2 36 32 392 292 3828d3a9587b3a9766a567a2b7570e42 124 +# -------------------------------- +step 24.72 +screendump 20080101_000001_5965948293222a6d6f3e545db40c23c1.ppm +# open start menu if not already open +sleep 10 +barrier_2 84 48 0 552 082462ce890968a264b9b13cddda8ae3 10 optional # Sending keys: ctrl-esc key ctrl-esc # -------------------------------- diff --git a/client/tests/kvm/steps/WinXP-32.steps b/client/tests/kvm/steps/WinXP-32.steps index b0c6e35..f52fd0e 100644 --- a/client/tests/kvm/steps/WinXP-32.steps +++ b/client/tests/kvm/steps/WinXP-32.steps @@ -136,7 +136,8 @@ key alt-n step 2251.56 screendump 20080101_000022_dcdc2fe9606c044ce648422afe42e23d.ppm # User -barrier_2 409 35 64 188 3d71d4d7a9364c1e6415b3d554ce6e5b 9 +barrier_2 161 37 312 187 a941ecbeb73f9d73e3e9c38da9a4b743 9 +# Sending keys: $user alt-n var user key alt-n # -------------------------------- @@ -154,6 +155,7 @@ barrier_2 48 51 391 288 bbac8a522510d7c8d6e515f6a3fbd4c3 240 step 2279.61 screendump 20090416_150641_b72ad5c48ec2dbc9814d569e38cbb4cc.ppm # Win XP Start Menu (closed) +sleep 20 barrier_2 104 41 0 559 a7cc02cecff2cb495f300aefbb99d9ae 5 optional # Sending keys: ctrl-esc key ctrl-esc diff --git a/client/tests/kvm/steps/WinXP-64.steps b/client/tests/kvm/steps/WinXP-64.steps index 20bac81..91e6d0f 100644 --- a/client/tests/kvm/steps/WinXP-64.steps +++ b/client/tests/kvm/steps/WinXP-64.steps @@ -74,7 +74,6 @@ key ret # -------------------------------- step 286.86 screendump 20080101_000010_bb878343930f948c0346f103a387157a.ppm -barrier_2 69 15 179 8 93889bdbe5351e61a6d9c7d00bb1c971 10 # -------------------------------- step 409.46 screendump 20080101_000011_30db9777a7883a07e6e65bff74e1d98f.ppm @@ -100,7 +99,7 @@ key 0xdc step 978.02 screendump 20080101_000014_213fbe6fa13bf32dfac6a00bf4205e45.ppm # Windows XP Start Menu Opened -barrier_2 48 20 274 420 c4a9620d84508013050e5a37a0d9e4ef 15 +barrier_2 129 30 196 72 aae68af7e05e2312c707f2f4bd73f024 15 # Sending keys: u key u # -------------------------------- -- 1.6.2.2 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
