Ubuntu Manual Tests

Merge ~bdrung/ubuntu-manual-tests:zfs-sort into ubuntu-manual-tests:main

  1. Git
  2. lp:~bdrung/ubuntu-manual-tests
  3. zfs-sort
  4. Merge into main
Proposed by Benjamin Drung
Status: Merged
Merged at revision: 5e9bb783b177ea55cd39d39a692107f7da6f4413
Proposed branch: ~bdrung/ubuntu-manual-tests:zfs-sort
Merge into: ubuntu-manual-tests:main
Diff against target: 78 lines (+22/-22)
2 files modified
definitions/basic_installation.xml (+11/-11)
testcases/image/1716_Install (entire disk with ZFS) (+11/-11)
Reviewer Review Type Date Requested Status
Ubuntu Testcase Admins Pending
Review via email: mp+431918@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

Thanks, I've updated the website with the updated test case.

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 f4eb8b7..988362f 100644
3--- a/definitions/basic_installation.xml
4+++ b/definitions/basic_installation.xml
5@@ -165,24 +165,24 @@
6 <dd>The system boots properly</dd>
7 <dd>The system loads into FAMILY showing username selected</dd>
8 <dd>Upon login, open a terminal, run the following commands and verify it matches the output</dd>
9- <dd><code>$ zfs mount
10- rpool/ROOT/ubuntu_UUID /
11+ <dd><code>$ zfs mount | sort
12 bpool/BOOT/ubuntu_UUID /boot
13- rpool/USERDATA/root_0y7dio /root
14+ rpool/ROOT/ubuntu_UUID /
15 rpool/ROOT/ubuntu_UUID/srv /srv
16- rpool/USERDATA/u_0y7dio /home/u
17 rpool/ROOT/ubuntu_UUID/usr/local /usr/local
18- rpool/ROOT/ubuntu_UUID/var/lib /var/lib
19 rpool/ROOT/ubuntu_UUID/var/games /var/games
20- rpool/ROOT/ubuntu_UUID/var/mail /var/mail
21- rpool/ROOT/ubuntu_UUID/var/snap /var/snap
22- rpool/ROOT/ubuntu_UUID/var/log /var/log
23- rpool/ROOT/ubuntu_UUID/var/www /var/www
24- rpool/ROOT/ubuntu_UUID/var/spool /var/spool
25 rpool/ROOT/ubuntu_UUID/var/lib/AccountsService /var/lib/AccountsService
26- rpool/ROOT/ubuntu_UUID/var/lib/NetworkManager /var/lib/NetworkManager
27 rpool/ROOT/ubuntu_UUID/var/lib/apt /var/lib/apt
28 rpool/ROOT/ubuntu_UUID/var/lib/dpkg /var/lib/dpkg
29+ rpool/ROOT/ubuntu_UUID/var/lib/NetworkManager /var/lib/NetworkManager
30+ rpool/ROOT/ubuntu_UUID/var/lib /var/lib
31+ rpool/ROOT/ubuntu_UUID/var/log /var/log
32+ rpool/ROOT/ubuntu_UUID/var/mail /var/mail
33+ rpool/ROOT/ubuntu_UUID/var/snap /var/snap
34+ rpool/ROOT/ubuntu_UUID/var/spool /var/spool
35+ rpool/ROOT/ubuntu_UUID/var/www /var/www
36+ rpool/USERDATA/root_0y7dio /root
37+ rpool/USERDATA/u_0y7dio /home/u
38 </code></dd>
39 </ut:test>
40
41diff --git a/testcases/image/1716_Install (entire disk with ZFS) b/testcases/image/1716_Install (entire disk with ZFS)
42index 38fd8e8..61be4bf 100755
43--- a/testcases/image/1716_Install (entire disk with ZFS)
44+++ b/testcases/image/1716_Install (entire disk with ZFS)
45@@ -77,24 +77,24 @@
46 <dd>The system boots properly</dd>
47 <dd>The system loads into FAMILY showing username selected</dd>
48 <dd>Upon login, open a terminal, run the following commands and verify it matches the output</dd>
49- <dd><code>$ zfs mount
50- rpool/ROOT/ubuntu_UUID /
51+ <dd><code>$ zfs mount | sort
52 bpool/BOOT/ubuntu_UUID /boot
53- rpool/USERDATA/root_0y7dio /root
54+ rpool/ROOT/ubuntu_UUID /
55 rpool/ROOT/ubuntu_UUID/srv /srv
56- rpool/USERDATA/u_0y7dio /home/u
57 rpool/ROOT/ubuntu_UUID/usr/local /usr/local
58- rpool/ROOT/ubuntu_UUID/var/lib /var/lib
59 rpool/ROOT/ubuntu_UUID/var/games /var/games
60- rpool/ROOT/ubuntu_UUID/var/mail /var/mail
61- rpool/ROOT/ubuntu_UUID/var/snap /var/snap
62- rpool/ROOT/ubuntu_UUID/var/log /var/log
63- rpool/ROOT/ubuntu_UUID/var/www /var/www
64- rpool/ROOT/ubuntu_UUID/var/spool /var/spool
65 rpool/ROOT/ubuntu_UUID/var/lib/AccountsService /var/lib/AccountsService
66- rpool/ROOT/ubuntu_UUID/var/lib/NetworkManager /var/lib/NetworkManager
67 rpool/ROOT/ubuntu_UUID/var/lib/apt /var/lib/apt
68 rpool/ROOT/ubuntu_UUID/var/lib/dpkg /var/lib/dpkg
69+ rpool/ROOT/ubuntu_UUID/var/lib/NetworkManager /var/lib/NetworkManager
70+ rpool/ROOT/ubuntu_UUID/var/lib /var/lib
71+ rpool/ROOT/ubuntu_UUID/var/log /var/log
72+ rpool/ROOT/ubuntu_UUID/var/mail /var/mail
73+ rpool/ROOT/ubuntu_UUID/var/snap /var/snap
74+ rpool/ROOT/ubuntu_UUID/var/spool /var/spool
75+ rpool/ROOT/ubuntu_UUID/var/www /var/www
76+ rpool/USERDATA/root_0y7dio /root
77+ rpool/USERDATA/u_0y7dio /home/u
78 </code></dd>
79
80

Subscribers

People subscribed via source and target branches