diff --git a/lib/anaconda.pm b/lib/anaconda.pm index 8325afaa..41f6ea8a 100644 --- a/lib/anaconda.pm +++ b/lib/anaconda.pm @@ -40,26 +40,15 @@ sub select_disks { } } else { - # Single disk cases. + # Single disk case. if ($args{disks} == 0) { - # Clicking will *de*-select...unless we're running into - # FIXME #1805553, in which case we should do nothing - if (check_screen "anaconda_install_destination_disk_selected") { - assert_and_click "anaconda_install_destination_select_disk_1"; - } - else { - record_soft_failure "Single disk not selected as install target - #1805553"; - } + # Clicking will *de*-select. + assert_and_click "anaconda_install_destination_select_disk_1"; } elsif ($args{disks} > 1) { die "Only one disk is connected! Cannot select $args{disks} disks."; } - # For exactly 1 disk, we don't need to do anything, unless - # we run into FIXME #1805553... - unless (check_screen "anaconda_install_destination_disk_selected") { - record_soft_failure "Single disk not selected as install target - #1805553"; - assert_and_click "anaconda_install_destination_select_disk_1"; - } + # For exactly 1 disk, we don't need to do anything. } # Handle network disks. diff --git a/needles/anaconda/install_destination/disk_selected-20200220.json b/needles/anaconda/install_destination/disk_selected-20200220.json deleted file mode 100644 index 1f8b44c4..00000000 --- a/needles/anaconda/install_destination/disk_selected-20200220.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "xpos": 89, - "ypos": 242, - "width": 25, - "height": 25, - "type": "match" - } - ], - "properties": [], - "tags": [ - "anaconda_install_destination_disk_selected" - ] -} \ No newline at end of file diff --git a/needles/anaconda/install_destination/disk_selected-20200220.png b/needles/anaconda/install_destination/disk_selected-20200220.png deleted file mode 100644 index 2520cfc5..00000000 Binary files a/needles/anaconda/install_destination/disk_selected-20200220.png and /dev/null differ