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

[Tim Andersson]

Unmerged commits

17fc38a... by Tim Andersson on 2023-09-18

fix: make amendments on changes to install alongside bitlocker steps

diff --git a/definitions/canary_desktop_cases.xml b/definitions/canary_desktop_cases.xml
index a616525..3da489b 100644
--- a/definitions/canary_desktop_cases.xml
+++ b/definitions/canary_desktop_cases.xml
@@ -408,11 +408,7 @@
     <ut:include ref="try-or-install" />
     <ut:include ref="start" />
     <ut:include ref="select-installation-type" />
-    <ut:include ref="entire-disk" />
-    <ut:include ref="bitlocker-screen" />
-    <ut:include ref="start" />
-    <ut:include ref="select-installation-type" />
-    <ut:include ref="entire-disk" />
+    <ut:include ref="entire-disk"/>
     <ut:include ref="setup" />
     <ut:include ref="reboot-ubuntu" /> 
   </ut:case>
@@ -573,6 +569,7 @@
     <ut:include ref="reboot-ubuntu" />
   </ut:case>
 
+<<<<<<< definitions/canary_desktop_cases.xml
   <ut:case id="1784_Install (entire disk with ZFS)">
     <ut:include ref="start" />
     <ut:include ref="select-installation-type" />
@@ -591,10 +588,16 @@
 
   <ut:case id="1786_Canary Non-English Installation Online">
     <p>The goal of this test case is to check that localization support is functional during the installation, that language packs are downloaded and installed correctly from the Internet and that the input methods for either Chinese, Japanese or Korean are working.</p>
+=======
+  <ut:case id="1790_Canary Install Alongside Windows BitLocker Partition With Insufficient Space">
+    <ut:include ref="bitlocker-config" />
+      <dd>Note for this test specifically you must have less than 15G free disk space outside the Windows partition.</dd>
+>>>>>>> definitions/canary_desktop_cases.xml
     <ut:include ref="grub" />
     <ut:include ref="try-or-install" />
     <ut:include ref="start" />
     <ut:include ref="select-installation-type" />
+<<<<<<< definitions/canary_desktop_cases.xml
     <ut:include ref="entire-disk" />
     <ut:include ref="setup" />
     <ut:include ref="reboot-ubuntu" />
@@ -631,6 +634,21 @@
   <ut:case id="1789_Install Screen Reader">
     <dt>For this test, you must boot the iso and after hearing the Ubuntu start up sound, press super+alt+s to activate the screen reader.</dt>
     <dt>After you've activated the screen reader, you must navigate through the install process doing a "Install (Entire Disk)" install, reboot and verify everthing works as intended.</dt>
+=======
+    <ut:include ref="resize" />
+    <dt>You should be greeted with a BitLocker screen which prompts you to reboot into Windows to free up some disk space.</dt>
+  </ut:case>
+
+  <ut:case id="1791_Canary Install Alongside Windows Bitlocker Partition">
+    <ut:include ref="bitlocker-config" />
+    <ut:include ref="grub" />
+    <ut:include ref="try-or-install" />
+    <ut:include ref="start" />
+    <ut:include ref="select-installation-type" />
+    <ut:include ref="resize"/>
+    <ut:include ref="setup" />
+    <ut:include ref="reboot-ubuntu" /> 
+>>>>>>> definitions/canary_desktop_cases.xml
   </ut:case>
 
 </ut:configuration>
diff --git a/testcases/image/1766_Canary Install Bitlocker b/testcases/image/1766_Canary Install Bitlocker
index 46ec8ea..d4440a3 100644
--- a/testcases/image/1766_Canary Install Bitlocker
+++ b/testcases/image/1766_Canary Install Bitlocker
@@ -56,6 +56,7 @@
     <dt>Click 'Start Installing'</dt>
   
     
+<<<<<<< testcases/image/1766_Canary Install Bitlocker
       <dd>The 'Turn off BitLocker' screen is displayed and there is no way to continue the installation</dd>
     <dt>Scan the QR code with a phone</dt>
       <dd>Verify that the page help.ubuntu.com/rst opens with detailed information about RST and how to disable it.</dd>
@@ -94,6 +95,8 @@
     <dt>Click 'Start Installing'</dt>
   
     
+=======
+>>>>>>> testcases/image/1766_Canary Install Bitlocker
       <dd>The 'Where are you?' screen is displayed</dd>
     <dt>If your system is connected to the network, note the preselected timezone corresponds with your timezone and the city indicated in the text box</dt>
       <dd>The timezone and city displayed match your timezone and a major city from your area</dd>
diff --git a/testcases/image/1790_Canary Install Alongside Windows BitLocker Partition With Insufficient Space b/testcases/image/1790_Canary Install Alongside Windows BitLocker Partition With Insufficient Space
new file mode 100644
index 0000000..ccb731b
--- /dev/null
+++ b/testcases/image/1790_Canary Install Alongside Windows BitLocker Partition With Insufficient Space
@@ -0,0 +1,74 @@
+<!-- Please do not edit this file directly; it was generated with the
+     tools/test_case_gen script using the following configuration as input:
+     definitions/canary_desktop_cases.xml
+-->
+
+    <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
+    <dl>
+      
+    
+   <dt>Try installing on a machine with a Windows installation and a bitlocker partition</dt>
+  
+      <dd>Note for this test specifically you must have less than 15G free disk space outside the Windows partition.</dd>
+    
+    <dt>Boot up the image</dt>
+      <dd>If you see the GRUB boot menu you should see the following:</dd>
+      <dd>
+         <li>'Try or Install FAMILY'</li>
+         <li>'FAMILY (safe graphics)'</li>
+         <li>'OEM install (for manufacturers)'</li>
+         <li>'Test memory' (only on BIOS systems)</li>
+      </dd>
+  
+    
+    <dt>Select the 'Try or Install FAMILY' option and press Enter</dt>
+      <dd>The system boots properly and loads the installer displaying the Welcome dialog with language selection and the mascot logo on the right.'</dd>
+  
+    
+    <dt>Click on 'Continue'</dt>
+      <dd>The 'Try or Install' screen is displayed with 'try FAMILY' and 'Install FAMILY' buttons</dd>
+    <dt>Click on the release notes hyperlink to confirm that a browser launches and you are taken to the release notes discourse page.</dt>
+    <dt>Click on the 'Install FAMILY' icon to select the option and click on the Continue button</dt>
+      <dd>The 'Keyboard layout' screen appears</dd>
+      <dd>The proposed keyboard corresponds with your keyboard</dd>
+    <dt>Select your keyboard layout and click on Continue</dt>
+      <dd>The 'Connect to internet' screen is displayed</dd>
+      <dd>The screen should reflect the current status and display those elements</dd>
+      <dd>
+         <li>Wired connection</li>
+         <li>Connect to a Wi-Fi network followed by a scrollable list of available APs, displaying an active one colored with a leading checkmark</li>
+         <li>Connect to a hidden Wi-Fi network</li>
+         <li>I don't want to connect to internet for now</li>
+      </dd>
+    <dt>Click on 'Continue'</dt>
+      <dd>The 'Updates and other software' screen is displayed, listing normal and minimal installation.</dd>
+  
+    
+    <dt>Click on 'Continue'</dt>
+      <dd>The 'Installation type' screen is displayed</dd>
+  
+    
+    <dt>Select 'Install FAMILY XX.XX alongside SYSTEM YY'</dt>
+        <dd>(SYSTEM YY is the name of the system already installed on disk (FAMILY 12.04, Windows 7, ...)</dd>
+    <dt>Click on 'Continue'</dt>
+        <dd>The Screen Install FAMILY XX.XX alongside SYSTEM YY appears</dd>
+    <dt>Note the drive selected on the Select drive list and the bar state</dt>
+    <strong>If the target drive has a free partition with sufficient free space, install will proceed without further partitioning intervention</strong>
+        <dd>The drive corresponds to the drive on the chart (e.g /dev/sda) and the bar is divided</dd>
+    <dt>Move the bar that separates the sections as appropriate</dt>
+        <dd>The slider bar can be set as appropriate</dd>
+    <dt>Click on the 'Install Now' button</dt>
+      <dd>The 'Write changes to disk' screen is displayed, including the details of incoming partitions changes.</dd>
+    <dt>Verify that the partitioning details make sense</dt>
+    <dt>Click 'Start Installing'</dt>
+  
+    <dt>You should be greeted with a BitLocker screen which prompts you to reboot into Windows to free up some disk space.</dt>
+  
+    </dl>
+    <p>If <strong>all</strong> actions produce the expected results described,
+      please <a href="results#add_result">submit</a> a 'passed' result.</p>
+    <p>If <strong>any</strong> action fails, or produces an unexpected result,
+      please <a href="results#add_result">submit</a> a 'failed' result and <a href="../../buginstructions">file a bug</a>. Please be sure to include
+      the bug number when you <a href="results#add_result">submit</a> your
+      result.</p>
+  
\ No newline at end of file
diff --git a/testcases/image/1791_Canary Install Alongside Windows Bitlocker Partition b/testcases/image/1791_Canary Install Alongside Windows Bitlocker Partition
new file mode 100644
index 0000000..7a20085
--- /dev/null
+++ b/testcases/image/1791_Canary Install Alongside Windows Bitlocker Partition
@@ -0,0 +1,98 @@
+<!-- Please do not edit this file directly; it was generated with the
+     tools/test_case_gen script using the following configuration as input:
+     definitions/canary_desktop_cases.xml
+-->
+
+    <p><em>Proceed in your native language if you wish. Instructions will remain in English.</em></p>
+    <dl>
+      
+    
+   <dt>Try installing on a machine with a Windows installation and a bitlocker partition</dt>
+  
+    
+    <dt>Boot up the image</dt>
+      <dd>If you see the GRUB boot menu you should see the following:</dd>
+      <dd>
+         <li>'Try or Install FAMILY'</li>
+         <li>'FAMILY (safe graphics)'</li>
+         <li>'OEM install (for manufacturers)'</li>
+         <li>'Test memory' (only on BIOS systems)</li>
+      </dd>
+  
+    
+    <dt>Select the 'Try or Install FAMILY' option and press Enter</dt>
+      <dd>The system boots properly and loads the installer displaying the Welcome dialog with language selection and the mascot logo on the right.'</dd>
+  
+    
+    <dt>Click on 'Continue'</dt>
+      <dd>The 'Try or Install' screen is displayed with 'try FAMILY' and 'Install FAMILY' buttons</dd>
+    <dt>Click on the release notes hyperlink to confirm that a browser launches and you are taken to the release notes discourse page.</dt>
+    <dt>Click on the 'Install FAMILY' icon to select the option and click on the Continue button</dt>
+      <dd>The 'Keyboard layout' screen appears</dd>
+      <dd>The proposed keyboard corresponds with your keyboard</dd>
+    <dt>Select your keyboard layout and click on Continue</dt>
+      <dd>The 'Connect to internet' screen is displayed</dd>
+      <dd>The screen should reflect the current status and display those elements</dd>
+      <dd>
+         <li>Wired connection</li>
+         <li>Connect to a Wi-Fi network followed by a scrollable list of available APs, displaying an active one colored with a leading checkmark</li>
+         <li>Connect to a hidden Wi-Fi network</li>
+         <li>I don't want to connect to internet for now</li>
+      </dd>
+    <dt>Click on 'Continue'</dt>
+      <dd>The 'Updates and other software' screen is displayed, listing normal and minimal installation.</dd>
+  
+    
+    <dt>Click on 'Continue'</dt>
+      <dd>The 'Installation type' screen is displayed</dd>
+  
+    
+    <dt>Select 'Install FAMILY XX.XX alongside SYSTEM YY'</dt>
+        <dd>(SYSTEM YY is the name of the system already installed on disk (FAMILY 12.04, Windows 7, ...)</dd>
+    <dt>Click on 'Continue'</dt>
+        <dd>The Screen Install FAMILY XX.XX alongside SYSTEM YY appears</dd>
+    <dt>Note the drive selected on the Select drive list and the bar state</dt>
+    <strong>If the target drive has a free partition with sufficient free space, install will proceed without further partitioning intervention</strong>
+        <dd>The drive corresponds to the drive on the chart (e.g /dev/sda) and the bar is divided</dd>
+    <dt>Move the bar that separates the sections as appropriate</dt>
+        <dd>The slider bar can be set as appropriate</dd>
+    <dt>Click on the 'Install Now' button</dt>
+      <dd>The 'Write changes to disk' screen is displayed, including the details of incoming partitions changes.</dd>
+    <dt>Verify that the partitioning details make sense</dt>
+    <dt>Click 'Start Installing'</dt>
+  
+    
+      <dd>The 'Where are you?' screen is displayed</dd>
+    <dt>If your system is connected to the network, note the preselected timezone corresponds with your timezone and the city indicated in the text box</dt>
+      <dd>The timezone and city displayed match your timezone and a major city from your area</dd>
+    <dt>Select your timezone, and click on the Continue button</dt>
+      <dd>The 'Who are you?' screen appears</dd>
+    <dt>Input your initial user details and password <em>admin can not be used - it is a dedicated Linux User</em></dt>
+
+      <dd>Name, username and password are accepted.</dd>
+      <dd>Continue button becomes available</dd>
+    <dt>Click on 'Continue'</dt>
+      <dd>The 'Choose your look' screen is displayed showing light and dark options</dd>
+    <dt>Click on 'Continue'</dt>
+      <dd>The 'Welcome to FAMILY' slide is displayed</dd>
+      <dd>The slideshow is entirely in your language</dd>
+    <dt>Wait for the installer to finish</dt>
+      <dd>An 'Installation Complete' dialog appears</dd>
+    <dt>Click the 'Restart into FAMILY XX.XX' button</dt>
+      <dd>GUI is shut down, a prompt to remove media and press Enter appears</dd>
+    <dt>Remove the disc and press enter</dt>
+      <dd>The machine is rebooted</dd>
+  
+    
+    <dt>Allow the machine to reboot</dt>
+      <dd>The system boots properly and loads into FAMILY showing username selected</dd>
+   
+  
+    </dl>
+    <p>If <strong>all</strong> actions produce the expected results described,
+      please <a href="results#add_result">submit</a> a 'passed' result.</p>
+    <p>If <strong>any</strong> action fails, or produces an unexpected result,
+      please <a href="results#add_result">submit</a> a 'failed' result and <a href="../../buginstructions">file a bug</a>. Please be sure to include
+      the bug number when you <a href="results#add_result">submit</a> your
+      result.</p>
+  
\ No newline at end of file