From ede7713a6ce35043a0b0334a8cdca33a0a7cb036 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 20 May 2016 11:56:48 -0700 Subject: [PATCH] disk_guided_encrypted: only switch layout when appropriate this stuff is only appropriate when a switched keyboard layout is in play. Left unconditional like this, it breaks the normal encrypted install test case. --- tests/disk_guided_encrypted.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/disk_guided_encrypted.pm b/tests/disk_guided_encrypted.pm index d7c6ecd9..cdf0eade 100644 --- a/tests/disk_guided_encrypted.pm +++ b/tests/disk_guided_encrypted.pm @@ -14,12 +14,16 @@ sub run { # type password for disk encryption wait_idle 5; - $self->switch_layout("us"); + if (get_var("SWITCHED_LAYOUT")) { + $self->switch_layout("us"); + } type_string get_var("ENCRYPT_PASSWORD"); send_key "tab"; type_string get_var("ENCRYPT_PASSWORD"); - # work around RHBZ #1333984 - $self->switch_layout("native"); + if (get_var("SWITCHED_LAYOUT")) { + # work around RHBZ #1333984 + $self->switch_layout("native"); + } assert_and_click "anaconda_install_destination_save_passphrase";