Merge ~paride/ubuntu-manual-tests:regenerate-canary into ubuntu-manual-tests:main

Proposed by Paride Legovini
Status: Rejected
Rejected by: Brian Murray
Proposed branch: ~paride/ubuntu-manual-tests:regenerate-canary
Merge into: ubuntu-manual-tests:main
Diff against target: 167 lines (+13/-13)
13 files modified
testcases/image/1760_Canary Install (entire disk) (+1/-1)
testcases/image/1761_Canary Install (manual partitioning) (+1/-1)
testcases/image/1762_Canary Install (auto-resize) (+1/-1)
testcases/image/1763_Canary Install (entire disk with lvm and encryption) (+1/-1)
testcases/image/1764_Canary Install (Safe Graphics mode) (+1/-1)
testcases/image/1765_Canary Install RST (+1/-1)
testcases/image/1766_Canary Install Bitlocker (+1/-1)
testcases/image/1768_Canary Install (manual partitioning re-using home partition) (+1/-1)
testcases/image/1769_Canary Non-English Installation No Network (+1/-1)
testcases/image/1770_Canary Install (Screen Reader) (+1/-1)
testcases/image/1771_Canary Install UEFI SecureBoot nVidia (+1/-1)
testcases/image/1772_Canary Install (erase and re-install) (+1/-1)
testcases/image/1773_Canary Non-English Installation Online and CJK Input (+1/-1)
Reviewer Review Type Date Requested Status
Brian Murray Disapprove
Ubuntu Testcase Admins Pending
Review via email: mp+450789@code.launchpad.net

Commit message

Regenerate the canary testcases to make them match the definitions

definitions/canary_desktop_cases.xml got modified in df5f8e40bc, but
after that the testcases were not regenerated by running
tools/test_case_gen.

his change brings the test cases in sync with the definitions.

To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

@Brian you made the change I refer to (df5f8e40bc).
Can you check this is the outcome you wanted? Thanks!

Revision history for this message
Brian Murray (brian-murray) wrote :

These ended up getting regenerated as a part of a different merge proposal, but thanks for catching this!

review: Disapprove

Unmerged commits

55f9ed4... by Paride Legovini

Regenerate the canary testcases to make them match the definitions

definitions/canary_desktop_cases.xml got modified in df5f8e40bc, but
after that the testcases were not regenerated by running
tools/test_case_gen.

This change brings the test cases in sync with the definitions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/testcases/image/1760_Canary Install (entire disk) b/testcases/image/1760_Canary Install (entire disk)
2index 7482820..ab97c39 100644
3--- a/testcases/image/1760_Canary Install (entire disk)
4+++ b/testcases/image/1760_Canary Install (entire disk)
5@@ -13,7 +13,7 @@
6 <li>'Try or Install FAMILY'</li>
7 <li>'FAMILY (safe graphics)'</li>
8 <li>'OEM install (for manufacturers)'</li>
9- <li>'Memory test' (only on BIOS systems)</li>
10+ <li>'Test memory' (only on BIOS systems)</li>
11 </dd>
12
13
14diff --git a/testcases/image/1761_Canary Install (manual partitioning) b/testcases/image/1761_Canary Install (manual partitioning)
15index 334564e..88ae18e 100644
16--- a/testcases/image/1761_Canary Install (manual partitioning)
17+++ b/testcases/image/1761_Canary Install (manual partitioning)
18@@ -13,7 +13,7 @@
19 <li>'Try or Install FAMILY'</li>
20 <li>'FAMILY (safe graphics)'</li>
21 <li>'OEM install (for manufacturers)'</li>
22- <li>'Memory test' (only on BIOS systems)</li>
23+ <li>'Test memory' (only on BIOS systems)</li>
24 </dd>
25
26
27diff --git a/testcases/image/1762_Canary Install (auto-resize) b/testcases/image/1762_Canary Install (auto-resize)
28index aa92422..97e5e9d 100644
29--- a/testcases/image/1762_Canary Install (auto-resize)
30+++ b/testcases/image/1762_Canary Install (auto-resize)
31@@ -13,7 +13,7 @@
32 <li>'Try or Install FAMILY'</li>
33 <li>'FAMILY (safe graphics)'</li>
34 <li>'OEM install (for manufacturers)'</li>
35- <li>'Memory test' (only on BIOS systems)</li>
36+ <li>'Test memory' (only on BIOS systems)</li>
37 </dd>
38
39
40diff --git a/testcases/image/1763_Canary Install (entire disk with lvm and encryption) b/testcases/image/1763_Canary Install (entire disk with lvm and encryption)
41index 0bb3439..f9f5ae9 100644
42--- a/testcases/image/1763_Canary Install (entire disk with lvm and encryption)
43+++ b/testcases/image/1763_Canary Install (entire disk with lvm and encryption)
44@@ -13,7 +13,7 @@
45 <li>'Try or Install FAMILY'</li>
46 <li>'FAMILY (safe graphics)'</li>
47 <li>'OEM install (for manufacturers)'</li>
48- <li>'Memory test' (only on BIOS systems)</li>
49+ <li>'Test memory' (only on BIOS systems)</li>
50 </dd>
51
52
53diff --git a/testcases/image/1764_Canary Install (Safe Graphics mode) b/testcases/image/1764_Canary Install (Safe Graphics mode)
54index fc18dd5..939f3a5 100644
55--- a/testcases/image/1764_Canary Install (Safe Graphics mode)
56+++ b/testcases/image/1764_Canary Install (Safe Graphics mode)
57@@ -13,7 +13,7 @@
58 <li>'Try or Install FAMILY'</li>
59 <li>'FAMILY (safe graphics)'</li>
60 <li>'OEM install (for manufacturers)'</li>
61- <li>'Memory test' (only on BIOS systems)</li>
62+ <li>'Test memory' (only on BIOS systems)</li>
63 </dd>
64
65
66diff --git a/testcases/image/1765_Canary Install RST b/testcases/image/1765_Canary Install RST
67index 541f10f..086ed67 100644
68--- a/testcases/image/1765_Canary Install RST
69+++ b/testcases/image/1765_Canary Install RST
70@@ -19,7 +19,7 @@
71 <li>'Try or Install FAMILY'</li>
72 <li>'FAMILY (safe graphics)'</li>
73 <li>'OEM install (for manufacturers)'</li>
74- <li>'Memory test' (only on BIOS systems)</li>
75+ <li>'Test memory' (only on BIOS systems)</li>
76 </dd>
77
78
79diff --git a/testcases/image/1766_Canary Install Bitlocker b/testcases/image/1766_Canary Install Bitlocker
80index 701bf2e..1086179 100644
81--- a/testcases/image/1766_Canary Install Bitlocker
82+++ b/testcases/image/1766_Canary Install Bitlocker
83@@ -16,7 +16,7 @@
84 <li>'Try or Install FAMILY'</li>
85 <li>'FAMILY (safe graphics)'</li>
86 <li>'OEM install (for manufacturers)'</li>
87- <li>'Memory test' (only on BIOS systems)</li>
88+ <li>'Test memory' (only on BIOS systems)</li>
89 </dd>
90
91
92diff --git a/testcases/image/1768_Canary Install (manual partitioning re-using home partition) b/testcases/image/1768_Canary Install (manual partitioning re-using home partition)
93index afdda2d..7fa6f50 100644
94--- a/testcases/image/1768_Canary Install (manual partitioning re-using home partition)
95+++ b/testcases/image/1768_Canary Install (manual partitioning re-using home partition)
96@@ -13,7 +13,7 @@
97 <li>'Try or Install FAMILY'</li>
98 <li>'FAMILY (safe graphics)'</li>
99 <li>'OEM install (for manufacturers)'</li>
100- <li>'Memory test' (only on BIOS systems)</li>
101+ <li>'Test memory' (only on BIOS systems)</li>
102 </dd>
103
104
105diff --git a/testcases/image/1769_Canary Non-English Installation No Network b/testcases/image/1769_Canary Non-English Installation No Network
106index c3a014d..a3b35c0 100644
107--- a/testcases/image/1769_Canary Non-English Installation No Network
108+++ b/testcases/image/1769_Canary Non-English Installation No Network
109@@ -18,7 +18,7 @@
110 <li>'Try or Install FAMILY'</li>
111 <li>'FAMILY (safe graphics)'</li>
112 <li>'OEM install (for manufacturers)'</li>
113- <li>'Memory test' (only on BIOS systems)</li>
114+ <li>'Test memory' (only on BIOS systems)</li>
115 </dd>
116
117
118diff --git a/testcases/image/1770_Canary Install (Screen Reader) b/testcases/image/1770_Canary Install (Screen Reader)
119index 798568c..fd97c86 100644
120--- a/testcases/image/1770_Canary Install (Screen Reader)
121+++ b/testcases/image/1770_Canary Install (Screen Reader)
122@@ -18,7 +18,7 @@
123 <li>'Try or Install FAMILY'</li>
124 <li>'FAMILY (safe graphics)'</li>
125 <li>'OEM install (for manufacturers)'</li>
126- <li>'Memory test' (only on BIOS systems)</li>
127+ <li>'Test memory' (only on BIOS systems)</li>
128 </dd>
129
130
131diff --git a/testcases/image/1771_Canary Install UEFI SecureBoot nVidia b/testcases/image/1771_Canary Install UEFI SecureBoot nVidia
132index c4f992e..7ec8936 100644
133--- a/testcases/image/1771_Canary Install UEFI SecureBoot nVidia
134+++ b/testcases/image/1771_Canary Install UEFI SecureBoot nVidia
135@@ -17,7 +17,7 @@
136 <li>'Try or Install FAMILY'</li>
137 <li>'FAMILY (safe graphics)'</li>
138 <li>'OEM install (for manufacturers)'</li>
139- <li>'Memory test' (only on BIOS systems)</li>
140+ <li>'Test memory' (only on BIOS systems)</li>
141 </dd>
142
143
144diff --git a/testcases/image/1772_Canary Install (erase and re-install) b/testcases/image/1772_Canary Install (erase and re-install)
145index fa1ce59..44d4db3 100644
146--- a/testcases/image/1772_Canary Install (erase and re-install)
147+++ b/testcases/image/1772_Canary Install (erase and re-install)
148@@ -13,7 +13,7 @@
149 <li>'Try or Install FAMILY'</li>
150 <li>'FAMILY (safe graphics)'</li>
151 <li>'OEM install (for manufacturers)'</li>
152- <li>'Memory test' (only on BIOS systems)</li>
153+ <li>'Test memory' (only on BIOS systems)</li>
154 </dd>
155
156
157diff --git a/testcases/image/1773_Canary Non-English Installation Online and CJK Input b/testcases/image/1773_Canary Non-English Installation Online and CJK Input
158index f2f24c0..9b05ff0 100644
159--- a/testcases/image/1773_Canary Non-English Installation Online and CJK Input
160+++ b/testcases/image/1773_Canary Non-English Installation Online and CJK Input
161@@ -14,7 +14,7 @@
162 <li>'Try or Install FAMILY'</li>
163 <li>'FAMILY (safe graphics)'</li>
164 <li>'OEM install (for manufacturers)'</li>
165- <li>'Memory test' (only on BIOS systems)</li>
166+ <li>'Test memory' (only on BIOS systems)</li>
167 </dd>
168
169

Subscribers

People subscribed via source and target branches