Merge ubuntu-manual-tests:reusehome into ubuntu-manual-tests:main

[Tim Andersson]

[Brian Murray (brian-murray)]

I'm not exactly clear on where the test file should be located. Is it something like '/home/my-file-which-should-exist-later'? or is it '~/my-file-which-should-exist-later'?

I tested with the former, '/home/my-file-which-should-exist-later', and received a Permission denied error so I don't think you meant that. But if you did we should clarify the instructions so that we state that you need to create the file as root.

If it is the latter case I think we can use '~' as a shortcut without confusing too many people provided we explicitly call out the exact commands to use e.g. 'touch ~/my-file-which-I-want-preserved'.

review: Needs Information

[Brian Murray (brian-murray)]

Looking at this again it seems like the problem was sorted although its not clear from the git history. I think this line resolves the issue:

<dt>Create a file in the home directory to check for later.</dt>

Given that there is more ambiguity here I'm good with this MP, so feel free to merge it and update the server accordingly.

Although this might also need adding to test case id 1768.

review: Approve

[Tim Andersson (andersson123)]

I really messed up rebasing this after making some changes, I'll amend now

[Tim Andersson (andersson123)]

Okay this is amended, please re-review

[Brian Murray (brian-murray)]

I think there is one issue I've identified in an in-line comment but I'll just fix it.

diff --git a/definitions/canary_desktop_cases.xml b/definitions/canary_desktop_cases.xml
index a616525..db4847c 100644
--- a/definitions/canary_desktop_cases.xml
+++ b/definitions/canary_desktop_cases.xml
@@ -90,7 +90,7 @@
   </ut:test>
 
   <ut:test id="custom-partition">
-    <dt>Select 'Something Else' and click 'Continue'</dt>
+    <dt>Select 'Manual Partitioning' and click 'Next'</dt>
       <dd>A screen showing the current hard disks and partition layouts is displayed</dd>
     <dt>Select the drive you wish to partition and use the Add '+', Change 'Change', and Delete '-' buttons to create your desired scheme</dt>
       <dd>The screen updates showing your desired partitions and mount points</dd>
@@ -274,7 +274,8 @@
   </ut:case>
 
   <ut:test id="reuse-postinst">
-    <dt>Login, ensure that the /home partition is still in use and the data from the previous installation have been preserved</dt>
+    <dt>Login, and check the following command runs without any errors:</dt>
+      <dd>echo /home/$USER/dummy_file</dd>
   </ut:test>
 
   <ut:test id="entire-disk-zfs">
@@ -347,6 +348,25 @@
     <dt>Click on the Next button</dt>
   </ut:test>
 
+  <ut:test id="reuse-home-initial-check">
+    <dt>Open a terminal using your FAMILY commands or GUI to do so, in terminal enter <code>df -h</code> and press enter</dt>
+		<dt>Terminal echoes the output of the df command</dt>
+      <dd>Check that / and /home use different partitions</dd>
+  </ut:test>
+
+  <ut:test id="reuse-home-setup-test-file">
+    <dt>Create a file in the /home/$USER/ directory to check for later.</dt>
+    <dt>Run the following command to create a file we'll check for later:</dt>
+      <dd>echo "dummy file" > /home/$USER/dummy_file</dd>
+  </ut:test>
+
+  <ut:test id="reinstall-reuse-home">
+    <dt>Shutdown the installed system.</dt>
+    <dt>Put the installation medium back in, and boot into the installation of a new system.</dt>
+      <dd>Do everything as before, but when you get to the manual partitioning screen, make sure to remove the old '/' partition, create a new one, and make sure the partition used for '/home' has also been selected to have '/home' as the mount point (highlight the existing home partition, and click the 'Change' button), but make sure the reformat check box is left unchecked.</dd>
+    <dt>Continue installation as normal, and reboot once finished.</dt>
+  </ut:test>
+
   <ut:case id="1761_Canary Install (manual partitioning)">
     <ut:include ref="grub" />
     <ut:include ref="try-or-install" />
@@ -429,6 +449,9 @@
     <ut:include ref="reuse-partition" />
     <ut:include ref="setup" />
     <ut:include ref="reboot-ubuntu" />
+    <ut:include ref="reuse-home-initial-check"/>
+    <ut:include ref="reuse-home-setup-test-file"/>
+    <ut:include ref="reinstall-reuse-home"/>
     <ut:include ref="reuse-postinst" />
   </ut:case>
 
diff --git a/testcases/image/1470_Install (manual partitioning re-using home partition) b/testcases/image/1470_Install (manual partitioning re-using home partition)
index ab63cfd..fa621f1 100755
--- a/testcases/image/1470_Install (manual partitioning re-using home partition)
+++ b/testcases/image/1470_Install (manual partitioning re-using home partition)
@@ -19,7 +19,7 @@
         </dd>
     <dt>Click on the continue button</dt>
         <dd>The 'Installation type' screen is displayed</dd>
-    <dt>Select Something Else</dt>
+    <dt>Select Manual Partitioning</dt>
         <dd>A screen showing the current hard disks and partition layouts is displayed</dd>
     <dt>Select the drive you wish to partition and use the 'Add', 'Change', and 'Delete' buttons to create your desired scheme</dt>
         <dd>The screen updates showing your desired partitions and mount points</dd>
@@ -47,6 +47,14 @@
     <dt>Open a terminal using your FAMILY commands or GUI to do so, in terminal enter <code>df -h</code> and press enter</dt>
 		<dd>Terminal echoes the output of the df command</dd>
     <dt>Check that / and /home use different partitions</dt>
+    <dt>Create a file in the /home/$USER/ directory to check for later.</dt>
+    <dt>Run the following command to create a file we'll check for later:</dt>
+        <dd>echo "dummy file" > /home/$USER/dummy_file</dd>
+    <dt>Shutdown the installed system.</dt>
+    <dt>Put the installation medium back in, and boot into the installation of a new system.</dt>
+        <dd>Do everything as before, but when you get to the manual partitioning screen, make sure to remove the old '/' partition, create a new one, and make sure the partition used for '/home' has also been selected to have '/home' as the mount point (highlight the existing home partition, and click the 'Change' button), but make sure the reformat check box is left unchecked.</dd>
+    <dt>Continue installation as normal, and reboot once finished.</dt>
+    <dt>Boot into the installed system and check the file you created in the previous install is present in the '/home/' directory</dt>
 </dl>
 
 <strong>If all actions produce the expected results listed, please <a href="results#add_result">submit</a> a 'passed' result.<br />
diff --git a/testcases/image/1761_Canary Install (manual partitioning) b/testcases/image/1761_Canary Install (manual partitioning)
index 8679d60..16694ea 100644
--- a/testcases/image/1761_Canary Install (manual partitioning)
+++ b/testcases/image/1761_Canary Install (manual partitioning)
@@ -45,7 +45,7 @@
   
     
     
-    <dt>Select 'Something Else' and click 'Continue'</dt>
+    <dt>Select 'Manual Partitioning' and click 'Next'</dt>
       <dd>A screen showing the current hard disks and partition layouts is displayed</dd>
     <dt>Select the drive you wish to partition and use the Add '+', Change 'Change', and Delete '-' buttons to create your desired scheme</dt>
       <dd>The screen updates showing your desired partitions and mount points</dd>
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 127d487..4a20870 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)
@@ -80,7 +80,24 @@
       <dd>The system boots properly and loads into FAMILY showing username selected</dd>
   
     
-    <dt>Login, ensure that the /home partition is still in use and the data from the previous installation have been preserved</dt>
+    <dt>Open a terminal using your FAMILY commands or GUI to do so, in terminal enter <code>df -h</code> and press enter</dt>
+		<dt>Terminal echoes the output of the df command</dt>
+      <dd>Check that / and /home use different partitions</dd>
+  
+    
+    <dt>Create a file in the /home/$USER/ directory to check for later.</dt>
+    <dt>Run the following command to create a file we'll check for later:</dt>
+      <dd>echo "dummy file" &gt; /home/$USER/dummy_file</dd>
+  
+    
+    <dt>Shutdown the installed system.</dt>
+    <dt>Put the installation medium back in, and boot into the installation of a new system.</dt>
+      <dd>Do everything as before, but when you get to the manual partitioning screen, make sure to remove the old '/' partition, create a new one, and make sure the partition used for '/home' has also been selected to have '/home' as the mount point (highlight the existing home partition, and click the 'Change' button), but make sure the reformat check box is left unchecked.</dd>
+    <dt>Continue installation as normal, and reboot once finished.</dt>
+  
+    
+    <dt>Login, and check the following command runs without any errors:</dt>
+      <dd>echo /home/$USER/dummy_file</dd>
   
   
     </dl>
diff --git a/testcases/image/1772_Canary Install (erase and re-install) b/testcases/image/1772_Canary Install (erase and re-install)
index 6e4196b..055c415 100644
--- a/testcases/image/1772_Canary Install (erase and re-install)
+++ b/testcases/image/1772_Canary Install (erase and re-install)
@@ -44,7 +44,7 @@
       <dd>The 'Installation type' screen is displayed</dd>
   
     
-    <dt>Select 'Something Else' and click 'Continue'</dt>
+    <dt>Select 'Manual Partitioning' and click 'Next'</dt>
       <dd>A screen showing the current hard disks and partition layouts is displayed</dd>
     <dt>Select the drive you wish to partition and use the Add '+', Change 'Change', and Delete '-' buttons to create your desired scheme</dt>
       <dd>The screen updates showing your desired partitions and mount points</dd>
@@ -116,7 +116,7 @@
   
 
     
-    <dt>Select 'Something Else' and click 'Continue'</dt>
+    <dt>Select 'Manual Partitioning' and click 'Next'</dt>
       <dd>A screen showing the current hard disks and partition layouts is displayed</dd>
     <dt>Select the drive you wish to partition and use the Add '+', Change 'Change', and Delete '-' buttons to create your desired scheme</dt>
       <dd>The screen updates showing your desired partitions and mount points</dd>