Ubuntu Manual Tests

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

  1. Git
  2. lp:ubuntu-manual-tests
  3. fix/bug#2015464
  4. Merge into main
Proposed by Tim Andersson
Status: Merged
Merged at revision: 4ffd2298b5ba39f69cfcb49ff7f28c06a69ffe28
Proposed branch: ubuntu-manual-tests:fix/bug#2015464
Merge into: ubuntu-manual-tests:main
Diff against target: 142 lines (+13/-13)
8 files modified
definitions/basic_installation.xml (+1/-1)
testcases/image/1300_Install (entire disk) (+2/-2)
testcases/image/1301_Install (auto-resize) (+2/-2)
testcases/image/1302_Install (manual partitioning) (+2/-2)
testcases/image/1451_Install (entire disk with lvm and encryption) (+2/-2)
testcases/image/1716_Install (entire disk with ZFS) (+2/-2)
testcases/image/1775_First login wizard (+1/-1)
testcases/image/1776_Install (Minimal) (+1/-1)
Reviewer Review Type Date Requested Status
Brian Murray Needs Fixing
Paride Legovini Pending
Review via email: mp+440974@code.launchpad.net

Commit message

Fix bug #2015464

Description of the change

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

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

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

review: Needs Fixing
Revision history for this message
Tim Andersson (andersson123) :
Revision history for this message
Tim Andersson (andersson123) :
Revision history for this message
Brian Murray (brian-murray) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/definitions/basic_installation.xml b/definitions/basic_installation.xml
2index 6e1951a..d25764b 100644
3--- a/definitions/basic_installation.xml
4+++ b/definitions/basic_installation.xml
5@@ -134,7 +134,7 @@
6 <dt>Select your timezone, and click on the Continue button</dt>
7 <dd>The 'Who are you?' screen appears</dd>
8 <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
9- <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
10+ <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>
11 <dd>Name, username and password are accepted.</dd>
12 <dd>Continue button becomes available</dd>
13 <dt>Press Continue</dt>
14diff --git a/testcases/image/1300_Install (entire disk) b/testcases/image/1300_Install (entire disk)
15index 29f41c0..0d64126 100755
16--- a/testcases/image/1300_Install (entire disk)
17+++ b/testcases/image/1300_Install (entire disk)
18@@ -1,6 +1,6 @@
19 <!-- Please do not edit this file directly; it was generated with the
20 tools/test_case_gen script using the following configuration as input:
21- definitions/basic_installation.xml
22+ ../definitions/basic_installation.xml
23 -->
24
25 <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
26@@ -54,7 +54,7 @@
27 <dt>Select your timezone, and click on the Continue button</dt>
28 <dd>The 'Who are you?' screen appears</dd>
29 <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
30- <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
31+ <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>
32 <dd>Name, username and password are accepted.</dd>
33 <dd>Continue button becomes available</dd>
34 <dt>Press Continue</dt>
35diff --git a/testcases/image/1301_Install (auto-resize) b/testcases/image/1301_Install (auto-resize)
36index 60b5e24..9f446b1 100755
37--- a/testcases/image/1301_Install (auto-resize)
38+++ b/testcases/image/1301_Install (auto-resize)
39@@ -1,6 +1,6 @@
40 <!-- Please do not edit this file directly; it was generated with the
41 tools/test_case_gen script using the following configuration as input:
42- definitions/basic_installation.xml
43+ ../definitions/basic_installation.xml
44 -->
45
46 <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
47@@ -54,7 +54,7 @@
48 <dt>Select your timezone, and click on the Continue button</dt>
49 <dd>The 'Who are you?' screen appears</dd>
50 <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
51- <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
52+ <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>
53 <dd>Name, username and password are accepted.</dd>
54 <dd>Continue button becomes available</dd>
55 <dt>Press Continue</dt>
56diff --git a/testcases/image/1302_Install (manual partitioning) b/testcases/image/1302_Install (manual partitioning)
57index e261dec..f483821 100755
58--- a/testcases/image/1302_Install (manual partitioning)
59+++ b/testcases/image/1302_Install (manual partitioning)
60@@ -1,6 +1,6 @@
61 <!-- Please do not edit this file directly; it was generated with the
62 tools/test_case_gen script using the following configuration as input:
63- definitions/basic_installation.xml
64+ ../definitions/basic_installation.xml
65 -->
66
67 <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
68@@ -48,7 +48,7 @@
69 <dt>Select your timezone, and click on the Continue button</dt>
70 <dd>The 'Who are you?' screen appears</dd>
71 <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
72- <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
73+ <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>
74 <dd>Name, username and password are accepted.</dd>
75 <dd>Continue button becomes available</dd>
76 <dt>Press Continue</dt>
77diff --git a/testcases/image/1451_Install (entire disk with lvm and encryption) b/testcases/image/1451_Install (entire disk with lvm and encryption)
78index 9ffdc16..b40a7ce 100755
79--- a/testcases/image/1451_Install (entire disk with lvm and encryption)
80+++ b/testcases/image/1451_Install (entire disk with lvm and encryption)
81@@ -1,6 +1,6 @@
82 <!-- Please do not edit this file directly; it was generated with the
83 tools/test_case_gen script using the following configuration as input:
84- definitions/basic_installation.xml
85+ ../definitions/basic_installation.xml
86 -->
87
88 <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
89@@ -66,7 +66,7 @@
90 <dt>Select your timezone, and click on the Continue button</dt>
91 <dd>The 'Who are you?' screen appears</dd>
92 <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
93- <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
94+ <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>
95 <dd>Name, username and password are accepted.</dd>
96 <dd>Continue button becomes available</dd>
97 <dt>Press Continue</dt>
98diff --git a/testcases/image/1716_Install (entire disk with ZFS) b/testcases/image/1716_Install (entire disk with ZFS)
99index f61ed73..b234ec5 100755
100--- a/testcases/image/1716_Install (entire disk with ZFS)
101+++ b/testcases/image/1716_Install (entire disk with ZFS)
102@@ -1,6 +1,6 @@
103 <!-- Please do not edit this file directly; it was generated with the
104 tools/test_case_gen script using the following configuration as input:
105- definitions/basic_installation.xml
106+ ../definitions/basic_installation.xml
107 -->
108
109 <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
110@@ -59,7 +59,7 @@
111 <dt>Select your timezone, and click on the Continue button</dt>
112 <dd>The 'Who are you?' screen appears</dd>
113 <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
114- <dd>'Require my password...' is selected but 'log in automatically' option is shown</dd>
115+ <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>
116 <dd>Name, username and password are accepted.</dd>
117 <dd>Continue button becomes available</dd>
118 <dt>Press Continue</dt>
119diff --git a/testcases/image/1775_First login wizard b/testcases/image/1775_First login wizard
120index 82900e0..dbd55b9 100644
121--- a/testcases/image/1775_First login wizard
122+++ b/testcases/image/1775_First login wizard
123@@ -1,6 +1,6 @@
124 <!-- Please do not edit this file directly; it was generated with the
125 tools/test_case_gen script using the following configuration as input:
126- definitions/basic_installation.xml
127+ ../definitions/basic_installation.xml
128 -->
129
130 <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
131diff --git a/testcases/image/1776_Install (Minimal) b/testcases/image/1776_Install (Minimal)
132index a3b8f10..251272c 100644
133--- a/testcases/image/1776_Install (Minimal)
134+++ b/testcases/image/1776_Install (Minimal)
135@@ -1,6 +1,6 @@
136 <!-- Please do not edit this file directly; it was generated with the
137 tools/test_case_gen script using the following configuration as input:
138- definitions/basic_installation.xml
139+ ../definitions/basic_installation.xml
140 -->
141
142 <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>

Subscribers

People subscribed via source and target branches

to all changes: