mirror of
				https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
				synced 2025-10-30 23:05:58 +00:00 
			
		
		
		
	In Fedora 33, we generally no longer include a disk-based swap partition by default (instead swap-on-ZRAM is used, see https://fedoraproject.org/wiki/Changes/SwapOnZRAM ). This tweaks our tests to account for that. In tests that aren't to do with swap at all, we stop including a swap partition in order to be closer to the default layout. We replace the old _no_swap blivet and custom tests with _with_swap tests that, as the name implies, *explicitly include* a swap partition, and adjust the postinstall test to check the disk swap partition is there. Signed-off-by: Adam Williamson <awilliam@redhat.com>
		
			
				
	
	
		
			39 lines
		
	
	
		
			1001 B
		
	
	
	
		
			Perl
		
	
	
	
	
	
			
		
		
	
	
			39 lines
		
	
	
		
			1001 B
		
	
	
	
		
			Perl
		
	
	
	
	
	
| use base "anacondatest";
 | |
| use strict;
 | |
| use testapi;
 | |
| use anaconda;
 | |
| 
 | |
| sub run {
 | |
|     my $self = shift;
 | |
|     # Go to INSTALLATION DESTINATION and ensure two disks are selected.
 | |
|     # Because PARTITIONING starts with 'custom_blivet', this will select blivet-gui.
 | |
|     select_disks(disks=>2);
 | |
|     assert_and_click "anaconda_spoke_done";
 | |
| 
 | |
|     if (get_var("UEFI")) {
 | |
|         # if we're running on UEFI, we need esp
 | |
|         custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
 | |
|     }
 | |
|     if (get_var("OFW")) {
 | |
|         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
 | |
|     }
 | |
| 
 | |
|     custom_blivet_add_partition(size => 512, mountpoint => '/boot');
 | |
|     custom_blivet_add_partition(raid1 => 1, mountpoint => '/');
 | |
| 
 | |
|     assert_and_click "anaconda_spoke_done";
 | |
|     assert_and_click "anaconda_part_accept_changes";
 | |
| 
 | |
|     # Anaconda hub
 | |
|     assert_screen "anaconda_main_hub", 300; #
 | |
| 
 | |
| }
 | |
| 
 | |
| sub test_flags {
 | |
|     return { fatal => 1 };
 | |
| }
 | |
| 
 | |
| 1;
 | |
| 
 | |
| # vim: set sw=4 et:
 |