kubuntu-council team mailing list archive

[Tim Andersson <mp+452665@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ubuntu-manual-tests:move_message_to_top_1790 into ubuntu-manual-tests:main.

Requested reviews:
  Ubuntu Testcase Admins (ubuntu-testcase)

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

diff --git a/definitions/basic_installation.xml b/definitions/basic_installation.xml
index ac6ee38..3c05ed6 100644
--- a/definitions/basic_installation.xml
+++ b/definitions/basic_installation.xml
@@ -137,7 +137,6 @@
   </ut:test>
 
   <ut:test id="zfs-load-encrypted-partition-from-live-session">
-    <p><strong>The next steps will make the initial installed system unusable afterwards, so bear that in mind.</strong></p>
     <dt>Shut down the installed system.</dt>
     <dt>Using the same .iso, boot into the iso using the disk that you just completed the installation on.</dt>
     <dt>Go through the grub menu and instead of installing, select "Try Ubuntu".</dt>
@@ -393,6 +392,7 @@
   </ut:case>
 
   <ut:case id="1790_Install (entire disk with ZFS plus encryption)">
+    <p><strong>This test involves installing a fresh system with zfs + encryption, then borking the system in a post-install test step. If the system you are installing on is important to you, and you want to preserve the zfs+encryption installed system, do not do this test.</strong></p>
     <ut:include ref="start" />
     <ut:include ref="entire-disk-zfs-encryption" />
     <ut:include ref="finish" />
diff --git a/testcases/image/1790_Install (entire disk with ZFS plus encryption) b/testcases/image/1790_Install (entire disk with ZFS plus encryption)
index ed34253..c3956fb 100644
--- a/testcases/image/1790_Install (entire disk with ZFS plus encryption)
+++ b/testcases/image/1790_Install (entire disk with ZFS plus encryption)
@@ -6,6 +6,7 @@
     <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
     <dl>
       
+    <p><strong>This test involves installing a fresh system with zfs + encryption, then borking the system in a post-install test step. If the system you are installing on is important to you, and you want to preserve the zfs+encryption installed system, do not do this test.</strong></p>
     
     <dt>Boot up the image</dt>
         <dd>If you see the GRUB boot menu you should see the following:</dd>
@@ -115,7 +116,6 @@
       <dd>We're going to check for this file in a later part of this test case.</dd>
   
     
-    <p><strong>The next steps will make the initial installed system unusable afterwards, so bear that in mind.</strong></p>
     <dt>Shut down the installed system.</dt>
     <dt>Using the same .iso, boot into the iso using the disk that you just completed the installation on.</dt>
     <dt>Go through the grub menu and instead of installing, select "Try Ubuntu".</dt>