Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop duplicate tags #2606

Merged
merged 2 commits into from
Mar 24, 2017
Merged

Drop duplicate tags #2606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ba968a
Drop bootloader-ofw tag
asmorodskyi Mar 16, 2017
afc17d4
Remove duplicated needle tag
asmorodskyi Mar 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/autoyast/autoyast_reboot.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ sub run {
reset_consoles;

#obsoletes installation/autoyast_reboot.pm
assert_screen("bios-boot", 900);
assert_screen("autoyast-boot", 20);
assert_screen("bios-boot", 900);
assert_screen("bootloader", 20);
}

sub test_flags {
Expand Down
2 changes: 1 addition & 1 deletion tests/autoyast/pxe_boot.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sub run {
resume_vm();

# wait for bootloader to appear
assert_screen("autoyast-boot", 300);
assert_screen("bootloader", 300);

# select network (second entry)
send_key "down";
Expand Down
6 changes: 3 additions & 3 deletions tests/installation/bootloader_ofw.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# notice and this notice are preserved. This file is offered as-is,
# without any warranty.

# Summary: Add first PowerPC test
# Maintainer: Dinar Valeev <k0da@opensuse.org>
# Summary: Handle PowerPC specific boot process
# Maintainer: Oliver Kurz <okurz@suse.de>

use base "installbasetest";
use strict;
Expand All @@ -22,7 +22,7 @@ use utils;

# hint: press shift-f10 trice for highest debug level
sub run() {
assert_screen "bootloader-ofw", 15;
assert_screen "bootloader", 15;
if (get_var("UPGRADE")) {
send_key_until_needlematch 'inst-onupgrade', 'up';
}
Expand Down
6 changes: 3 additions & 3 deletions tests/support_server/boot.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# You should have received a copy of the GNU General Public License along
# with this program; if not, see <http://www.gnu.org/licenses/>.

# G-Summary: supportserver and supportserver generator implementation
# G-Maintainer: Pavel Sladek <psladek@suse.com>
# Summary: supportserver and supportserver generator implementation
# Maintainer: Pavel Sladek <psladek@suse.com>

use strict;
use base 'basetest';
Expand All @@ -26,7 +26,7 @@ sub run {
check_screen("inst-bootmenu", 10);
send_key "ret"; #faster boot if boot from cd
}
assert_screen("autoyast-boot", 10);
assert_screen("bootloader", 10);
send_key "ret"; #faster boot

}
Expand Down