Merge ubuntu-manual-tests:fix/bug#2015464 into ubuntu-manual-tests:main

[Tim Andersson]

Fix bug #2015464

Modify wording of 'Login automatically' to reflect 'Require password to log in' in new installer

[Brian Murray (brian-murray)]

I think the wording is still a bit unclear (see my in-line comment), could you sort it out?

review: Needs Fixing

[Brian Murray (brian-murray)]

One last suggestion - take it or leave it as you see fit.

diff --git a/definitions/basic_installation.xml b/definitions/basic_installation.xml
index 6e1951a..d25764b 100644
--- a/definitions/basic_installation.xml
+++ b/definitions/basic_installation.xml
@@ -134,7 +134,7 @@
     <dt>Select your timezone, and click on the Continue button</dt>
         <dd>The 'Who are you?' screen appears</dd>
     <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
-        <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
+        <dd>'Require my password to log in' is shown and selected or if 'Log in automatically' and 'require my password to log in' are shown then 'Require my password to login' is selected. If just 'Require my password to log in' is shown, having it off is the equivalent of having 'Log in automatically' on.</dd>
         <dd>Name, username and password are accepted.</dd>
         <dd>Continue button becomes available</dd>
     <dt>Press Continue</dt>
diff --git a/testcases/image/1300_Install (entire disk) b/testcases/image/1300_Install (entire disk)
index 29f41c0..0d64126 100755
--- a/testcases/image/1300_Install (entire disk)
+++ b/testcases/image/1300_Install (entire disk)
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     definitions/basic_installation.xml
+     ../definitions/basic_installation.xml
 -->
 
     <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
@@ -54,7 +54,7 @@
     <dt>Select your timezone, and click on the Continue button</dt>
         <dd>The 'Who are you?' screen appears</dd>
     <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
-        <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
+        <dd>'Require my password to log in' is shown and selected or if 'Log in automatically' and 'require my password to log in' are shown then 'Require my password to login' is selected. If just 'Require my password to log in' is shown, having it off is the equivalent of having 'Log in automatically' on.</dd>
         <dd>Name, username and password are accepted.</dd>
         <dd>Continue button becomes available</dd>
     <dt>Press Continue</dt>
diff --git a/testcases/image/1301_Install (auto-resize) b/testcases/image/1301_Install (auto-resize)
index 60b5e24..9f446b1 100755
--- a/testcases/image/1301_Install (auto-resize)
+++ b/testcases/image/1301_Install (auto-resize)
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     definitions/basic_installation.xml
+     ../definitions/basic_installation.xml
 -->
 
     <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
@@ -54,7 +54,7 @@
     <dt>Select your timezone, and click on the Continue button</dt>
         <dd>The 'Who are you?' screen appears</dd>
     <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
-        <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
+        <dd>'Require my password to log in' is shown and selected or if 'Log in automatically' and 'require my password to log in' are shown then 'Require my password to login' is selected. If just 'Require my password to log in' is shown, having it off is the equivalent of having 'Log in automatically' on.</dd>
         <dd>Name, username and password are accepted.</dd>
         <dd>Continue button becomes available</dd>
     <dt>Press Continue</dt>
diff --git a/testcases/image/1302_Install (manual partitioning) b/testcases/image/1302_Install (manual partitioning)
index e261dec..f483821 100755
--- a/testcases/image/1302_Install (manual partitioning)
+++ b/testcases/image/1302_Install (manual partitioning)
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     definitions/basic_installation.xml
+     ../definitions/basic_installation.xml
 -->
 
     <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
@@ -48,7 +48,7 @@
     <dt>Select your timezone, and click on the Continue button</dt>
         <dd>The 'Who are you?' screen appears</dd>
     <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
-        <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
+        <dd>'Require my password to log in' is shown and selected or if 'Log in automatically' and 'require my password to log in' are shown then 'Require my password to login' is selected. If just 'Require my password to log in' is shown, having it off is the equivalent of having 'Log in automatically' on.</dd>
         <dd>Name, username and password are accepted.</dd>
         <dd>Continue button becomes available</dd>
     <dt>Press Continue</dt>
diff --git a/testcases/image/1451_Install (entire disk with lvm and encryption) b/testcases/image/1451_Install (entire disk with lvm and encryption)
index 9ffdc16..b40a7ce 100755
--- a/testcases/image/1451_Install (entire disk with lvm and encryption)
+++ b/testcases/image/1451_Install (entire disk with lvm and encryption)
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     definitions/basic_installation.xml
+     ../definitions/basic_installation.xml
 -->
 
     <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
@@ -66,7 +66,7 @@
     <dt>Select your timezone, and click on the Continue button</dt>
         <dd>The 'Who are you?' screen appears</dd>
     <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
-        <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
+        <dd>'Require my password to log in' is shown and selected or if 'Log in automatically' and 'require my password to log in' are shown then 'Require my password to login' is selected. If just 'Require my password to log in' is shown, having it off is the equivalent of having 'Log in automatically' on.</dd>
         <dd>Name, username and password are accepted.</dd>
         <dd>Continue button becomes available</dd>
     <dt>Press Continue</dt>
diff --git a/testcases/image/1716_Install (entire disk with ZFS) b/testcases/image/1716_Install (entire disk with ZFS)
index f61ed73..b234ec5 100755
--- a/testcases/image/1716_Install (entire disk with ZFS)
+++ b/testcases/image/1716_Install (entire disk with ZFS)
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     definitions/basic_installation.xml
+     ../definitions/basic_installation.xml
 -->
 
     <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
@@ -59,7 +59,7 @@
     <dt>Select your timezone, and click on the Continue button</dt>
         <dd>The 'Who are you?' screen appears</dd>
     <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
-        <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
+        <dd>'Require my password to log in' is shown and selected or if 'Log in automatically' and 'require my password to log in' are shown then 'Require my password to login' is selected. If just 'Require my password to log in' is shown, having it off is the equivalent of having 'Log in automatically' on.</dd>
         <dd>Name, username and password are accepted.</dd>
         <dd>Continue button becomes available</dd>
     <dt>Press Continue</dt>
diff --git a/testcases/image/1775_First login wizard b/testcases/image/1775_First login wizard
index 82900e0..dbd55b9 100644
--- a/testcases/image/1775_First login wizard
+++ b/testcases/image/1775_First login wizard
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     definitions/basic_installation.xml
+     ../definitions/basic_installation.xml
 -->
 
     <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
diff --git a/testcases/image/1776_Install (Minimal) b/testcases/image/1776_Install (Minimal)
index a3b8f10..251272c 100644
--- a/testcases/image/1776_Install (Minimal)
+++ b/testcases/image/1776_Install (Minimal)
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     definitions/basic_installation.xml
+     ../definitions/basic_installation.xml
 -->
 
     <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>