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
diff --git a/testcases/image/1760_Canary Install (entire disk) b/testcases/image/1760_Canary Install (entire disk)
index 7482820..ab97c39 100644
--- a/testcases/image/1760_Canary Install (entire disk)
+++ b/testcases/image/1760_Canary Install (entire disk)
@@ -13,7 +13,7 @@
13 <li>'Try or Install FAMILY'</li>13 <li>'Try or Install FAMILY'</li>
14 <li>'FAMILY (safe graphics)'</li>14 <li>'FAMILY (safe graphics)'</li>
15 <li>'OEM install (for manufacturers)'</li>15 <li>'OEM install (for manufacturers)'</li>
16 <li>'Memory test' (only on BIOS systems)</li>16 <li>'Test memory' (only on BIOS systems)</li>
17 </dd>17 </dd>
18 18
19 19
diff --git a/testcases/image/1761_Canary Install (manual partitioning) b/testcases/image/1761_Canary Install (manual partitioning)
index 334564e..88ae18e 100644
--- a/testcases/image/1761_Canary Install (manual partitioning)
+++ b/testcases/image/1761_Canary Install (manual partitioning)
@@ -13,7 +13,7 @@
13 <li>'Try or Install FAMILY'</li>13 <li>'Try or Install FAMILY'</li>
14 <li>'FAMILY (safe graphics)'</li>14 <li>'FAMILY (safe graphics)'</li>
15 <li>'OEM install (for manufacturers)'</li>15 <li>'OEM install (for manufacturers)'</li>
16 <li>'Memory test' (only on BIOS systems)</li>16 <li>'Test memory' (only on BIOS systems)</li>
17 </dd>17 </dd>
18 18
19 19
diff --git a/testcases/image/1762_Canary Install (auto-resize) b/testcases/image/1762_Canary Install (auto-resize)
index aa92422..97e5e9d 100644
--- a/testcases/image/1762_Canary Install (auto-resize)
+++ b/testcases/image/1762_Canary Install (auto-resize)
@@ -13,7 +13,7 @@
13 <li>'Try or Install FAMILY'</li>13 <li>'Try or Install FAMILY'</li>
14 <li>'FAMILY (safe graphics)'</li>14 <li>'FAMILY (safe graphics)'</li>
15 <li>'OEM install (for manufacturers)'</li>15 <li>'OEM install (for manufacturers)'</li>
16 <li>'Memory test' (only on BIOS systems)</li>16 <li>'Test memory' (only on BIOS systems)</li>
17 </dd>17 </dd>
18 18
19 19
diff --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)
index 0bb3439..f9f5ae9 100644
--- a/testcases/image/1763_Canary Install (entire disk with lvm and encryption)
+++ b/testcases/image/1763_Canary Install (entire disk with lvm and encryption)
@@ -13,7 +13,7 @@
13 <li>'Try or Install FAMILY'</li>13 <li>'Try or Install FAMILY'</li>
14 <li>'FAMILY (safe graphics)'</li>14 <li>'FAMILY (safe graphics)'</li>
15 <li>'OEM install (for manufacturers)'</li>15 <li>'OEM install (for manufacturers)'</li>
16 <li>'Memory test' (only on BIOS systems)</li>16 <li>'Test memory' (only on BIOS systems)</li>
17 </dd>17 </dd>
18 18
19 19
diff --git a/testcases/image/1764_Canary Install (Safe Graphics mode) b/testcases/image/1764_Canary Install (Safe Graphics mode)
index fc18dd5..939f3a5 100644
--- a/testcases/image/1764_Canary Install (Safe Graphics mode)
+++ b/testcases/image/1764_Canary Install (Safe Graphics mode)
@@ -13,7 +13,7 @@
13 <li>'Try or Install FAMILY'</li>13 <li>'Try or Install FAMILY'</li>
14 <li>'FAMILY (safe graphics)'</li>14 <li>'FAMILY (safe graphics)'</li>
15 <li>'OEM install (for manufacturers)'</li>15 <li>'OEM install (for manufacturers)'</li>
16 <li>'Memory test' (only on BIOS systems)</li>16 <li>'Test memory' (only on BIOS systems)</li>
17 </dd>17 </dd>
18 18
19 19
diff --git a/testcases/image/1765_Canary Install RST b/testcases/image/1765_Canary Install RST
index 541f10f..086ed67 100644
--- a/testcases/image/1765_Canary Install RST
+++ b/testcases/image/1765_Canary Install RST
@@ -19,7 +19,7 @@
19 <li>'Try or Install FAMILY'</li>19 <li>'Try or Install FAMILY'</li>
20 <li>'FAMILY (safe graphics)'</li>20 <li>'FAMILY (safe graphics)'</li>
21 <li>'OEM install (for manufacturers)'</li>21 <li>'OEM install (for manufacturers)'</li>
22 <li>'Memory test' (only on BIOS systems)</li>22 <li>'Test memory' (only on BIOS systems)</li>
23 </dd>23 </dd>
24 24
25 25
diff --git a/testcases/image/1766_Canary Install Bitlocker b/testcases/image/1766_Canary Install Bitlocker
index 701bf2e..1086179 100644
--- a/testcases/image/1766_Canary Install Bitlocker
+++ b/testcases/image/1766_Canary Install Bitlocker
@@ -16,7 +16,7 @@
16 <li>'Try or Install FAMILY'</li>16 <li>'Try or Install FAMILY'</li>
17 <li>'FAMILY (safe graphics)'</li>17 <li>'FAMILY (safe graphics)'</li>
18 <li>'OEM install (for manufacturers)'</li>18 <li>'OEM install (for manufacturers)'</li>
19 <li>'Memory test' (only on BIOS systems)</li>19 <li>'Test memory' (only on BIOS systems)</li>
20 </dd>20 </dd>
21 21
22 22
diff --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)
index afdda2d..7fa6f50 100644
--- a/testcases/image/1768_Canary Install (manual partitioning re-using home partition)
+++ b/testcases/image/1768_Canary Install (manual partitioning re-using home partition)
@@ -13,7 +13,7 @@
13 <li>'Try or Install FAMILY'</li>13 <li>'Try or Install FAMILY'</li>
14 <li>'FAMILY (safe graphics)'</li>14 <li>'FAMILY (safe graphics)'</li>
15 <li>'OEM install (for manufacturers)'</li>15 <li>'OEM install (for manufacturers)'</li>
16 <li>'Memory test' (only on BIOS systems)</li>16 <li>'Test memory' (only on BIOS systems)</li>
17 </dd>17 </dd>
18 18
19 19
diff --git a/testcases/image/1769_Canary Non-English Installation No Network b/testcases/image/1769_Canary Non-English Installation No Network
index c3a014d..a3b35c0 100644
--- a/testcases/image/1769_Canary Non-English Installation No Network
+++ b/testcases/image/1769_Canary Non-English Installation No Network
@@ -18,7 +18,7 @@
18 <li>'Try or Install FAMILY'</li>18 <li>'Try or Install FAMILY'</li>
19 <li>'FAMILY (safe graphics)'</li>19 <li>'FAMILY (safe graphics)'</li>
20 <li>'OEM install (for manufacturers)'</li>20 <li>'OEM install (for manufacturers)'</li>
21 <li>'Memory test' (only on BIOS systems)</li>21 <li>'Test memory' (only on BIOS systems)</li>
22 </dd>22 </dd>
23 23
24 24
diff --git a/testcases/image/1770_Canary Install (Screen Reader) b/testcases/image/1770_Canary Install (Screen Reader)
index 798568c..fd97c86 100644
--- a/testcases/image/1770_Canary Install (Screen Reader)
+++ b/testcases/image/1770_Canary Install (Screen Reader)
@@ -18,7 +18,7 @@
18 <li>'Try or Install FAMILY'</li>18 <li>'Try or Install FAMILY'</li>
19 <li>'FAMILY (safe graphics)'</li>19 <li>'FAMILY (safe graphics)'</li>
20 <li>'OEM install (for manufacturers)'</li>20 <li>'OEM install (for manufacturers)'</li>
21 <li>'Memory test' (only on BIOS systems)</li>21 <li>'Test memory' (only on BIOS systems)</li>
22 </dd>22 </dd>
23 23
24 24
diff --git a/testcases/image/1771_Canary Install UEFI SecureBoot nVidia b/testcases/image/1771_Canary Install UEFI SecureBoot nVidia
index c4f992e..7ec8936 100644
--- a/testcases/image/1771_Canary Install UEFI SecureBoot nVidia
+++ b/testcases/image/1771_Canary Install UEFI SecureBoot nVidia
@@ -17,7 +17,7 @@
17 <li>'Try or Install FAMILY'</li>17 <li>'Try or Install FAMILY'</li>
18 <li>'FAMILY (safe graphics)'</li>18 <li>'FAMILY (safe graphics)'</li>
19 <li>'OEM install (for manufacturers)'</li>19 <li>'OEM install (for manufacturers)'</li>
20 <li>'Memory test' (only on BIOS systems)</li>20 <li>'Test memory' (only on BIOS systems)</li>
21 </dd>21 </dd>
22 22
23 23
diff --git a/testcases/image/1772_Canary Install (erase and re-install) b/testcases/image/1772_Canary Install (erase and re-install)
index fa1ce59..44d4db3 100644
--- a/testcases/image/1772_Canary Install (erase and re-install)
+++ b/testcases/image/1772_Canary Install (erase and re-install)
@@ -13,7 +13,7 @@
13 <li>'Try or Install FAMILY'</li>13 <li>'Try or Install FAMILY'</li>
14 <li>'FAMILY (safe graphics)'</li>14 <li>'FAMILY (safe graphics)'</li>
15 <li>'OEM install (for manufacturers)'</li>15 <li>'OEM install (for manufacturers)'</li>
16 <li>'Memory test' (only on BIOS systems)</li>16 <li>'Test memory' (only on BIOS systems)</li>
17 </dd>17 </dd>
18 18
19 19
diff --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
index f2f24c0..9b05ff0 100644
--- a/testcases/image/1773_Canary Non-English Installation Online and CJK Input
+++ b/testcases/image/1773_Canary Non-English Installation Online and CJK Input
@@ -14,7 +14,7 @@
14 <li>'Try or Install FAMILY'</li>14 <li>'Try or Install FAMILY'</li>
15 <li>'FAMILY (safe graphics)'</li>15 <li>'FAMILY (safe graphics)'</li>
16 <li>'OEM install (for manufacturers)'</li>16 <li>'OEM install (for manufacturers)'</li>
17 <li>'Memory test' (only on BIOS systems)</li>17 <li>'Test memory' (only on BIOS systems)</li>
18 </dd>18 </dd>
19 19
20 20

Subscribers

People subscribed via source and target branches