kubuntu-council team mailing list archive

[Benjamin Drung <mp+431918@xxxxxxxxxxxxxxxxxx>]

Benjamin Drung has proposed merging ~bdrung/ubuntu-manual-tests:zfs-sort into ubuntu-manual-tests:main.

Requested reviews:
  Ubuntu Testcase Admins (ubuntu-testcase)

For more details, see:
https://code.launchpad.net/~bdrung/ubuntu-manual-tests/+git/ubuntu-manual-tests/+merge/431918
-- 
Your team Ubuntu Testcase Admins is requested to review the proposed merge of ~bdrung/ubuntu-manual-tests:zfs-sort into ubuntu-manual-tests:main.

diff --git a/definitions/basic_installation.xml b/definitions/basic_installation.xml
index f4eb8b7..988362f 100644
--- a/definitions/basic_installation.xml
+++ b/definitions/basic_installation.xml
@@ -165,24 +165,24 @@
         <dd>The system boots properly</dd>
         <dd>The system loads into FAMILY showing username selected</dd>
         <dd>Upon login, open a terminal, run the following commands and verify it matches the output</dd>
-        <dd><code>$ zfs mount
-            rpool/ROOT/ubuntu_UUID        /
+        <dd><code>$ zfs mount | sort
             bpool/BOOT/ubuntu_UUID        /boot
-            rpool/USERDATA/root_0y7dio      /root
+            rpool/ROOT/ubuntu_UUID        /
             rpool/ROOT/ubuntu_UUID/srv    /srv
-            rpool/USERDATA/u_0y7dio         /home/u
             rpool/ROOT/ubuntu_UUID/usr/local  /usr/local
-            rpool/ROOT/ubuntu_UUID/var/lib  /var/lib
             rpool/ROOT/ubuntu_UUID/var/games  /var/games
-            rpool/ROOT/ubuntu_UUID/var/mail  /var/mail
-            rpool/ROOT/ubuntu_UUID/var/snap  /var/snap
-            rpool/ROOT/ubuntu_UUID/var/log  /var/log
-            rpool/ROOT/ubuntu_UUID/var/www  /var/www
-            rpool/ROOT/ubuntu_UUID/var/spool  /var/spool
             rpool/ROOT/ubuntu_UUID/var/lib/AccountsService  /var/lib/AccountsService
-            rpool/ROOT/ubuntu_UUID/var/lib/NetworkManager  /var/lib/NetworkManager
             rpool/ROOT/ubuntu_UUID/var/lib/apt  /var/lib/apt
             rpool/ROOT/ubuntu_UUID/var/lib/dpkg  /var/lib/dpkg
+            rpool/ROOT/ubuntu_UUID/var/lib/NetworkManager  /var/lib/NetworkManager
+            rpool/ROOT/ubuntu_UUID/var/lib  /var/lib
+            rpool/ROOT/ubuntu_UUID/var/log  /var/log
+            rpool/ROOT/ubuntu_UUID/var/mail  /var/mail
+            rpool/ROOT/ubuntu_UUID/var/snap  /var/snap
+            rpool/ROOT/ubuntu_UUID/var/spool  /var/spool
+            rpool/ROOT/ubuntu_UUID/var/www  /var/www
+            rpool/USERDATA/root_0y7dio      /root
+            rpool/USERDATA/u_0y7dio         /home/u
         </code></dd>
   </ut:test>
 
diff --git a/testcases/image/1716_Install (entire disk with ZFS) b/testcases/image/1716_Install (entire disk with ZFS)
index 38fd8e8..61be4bf 100755
--- a/testcases/image/1716_Install (entire disk with ZFS)
+++ b/testcases/image/1716_Install (entire disk with ZFS)
@@ -77,24 +77,24 @@
         <dd>The system boots properly</dd>
         <dd>The system loads into FAMILY showing username selected</dd>
         <dd>Upon login, open a terminal, run the following commands and verify it matches the output</dd>
-        <dd><code>$ zfs mount
-            rpool/ROOT/ubuntu_UUID        /
+        <dd><code>$ zfs mount | sort
             bpool/BOOT/ubuntu_UUID        /boot
-            rpool/USERDATA/root_0y7dio      /root
+            rpool/ROOT/ubuntu_UUID        /
             rpool/ROOT/ubuntu_UUID/srv    /srv
-            rpool/USERDATA/u_0y7dio         /home/u
             rpool/ROOT/ubuntu_UUID/usr/local  /usr/local
-            rpool/ROOT/ubuntu_UUID/var/lib  /var/lib
             rpool/ROOT/ubuntu_UUID/var/games  /var/games
-            rpool/ROOT/ubuntu_UUID/var/mail  /var/mail
-            rpool/ROOT/ubuntu_UUID/var/snap  /var/snap
-            rpool/ROOT/ubuntu_UUID/var/log  /var/log
-            rpool/ROOT/ubuntu_UUID/var/www  /var/www
-            rpool/ROOT/ubuntu_UUID/var/spool  /var/spool
             rpool/ROOT/ubuntu_UUID/var/lib/AccountsService  /var/lib/AccountsService
-            rpool/ROOT/ubuntu_UUID/var/lib/NetworkManager  /var/lib/NetworkManager
             rpool/ROOT/ubuntu_UUID/var/lib/apt  /var/lib/apt
             rpool/ROOT/ubuntu_UUID/var/lib/dpkg  /var/lib/dpkg
+            rpool/ROOT/ubuntu_UUID/var/lib/NetworkManager  /var/lib/NetworkManager
+            rpool/ROOT/ubuntu_UUID/var/lib  /var/lib
+            rpool/ROOT/ubuntu_UUID/var/log  /var/log
+            rpool/ROOT/ubuntu_UUID/var/mail  /var/mail
+            rpool/ROOT/ubuntu_UUID/var/snap  /var/snap
+            rpool/ROOT/ubuntu_UUID/var/spool  /var/spool
+            rpool/ROOT/ubuntu_UUID/var/www  /var/www
+            rpool/USERDATA/root_0y7dio      /root
+            rpool/USERDATA/u_0y7dio         /home/u
         </code></dd>