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.

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

Separate systemsettings test for KDE4-based and KF5-based #960

Merged
merged 1 commit into from Jan 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions main.pm
Expand Up @@ -168,7 +168,8 @@ if (check_var('DESKTOP', 'minimalx')) {
}

# now Plasma 5 is default KDE desktop
if (check_var('DESKTOP', 'kde')) {
# openSUSE version less than or equal to 13.2 have to set KDE4 variable as 1
if (check_var('DESKTOP', 'kde') && !get_var('KDE4')) {
set_var("PLASMA5", 1);
}

Expand Down Expand Up @@ -619,7 +620,12 @@ sub load_x11tests() {
}
if (kdestep_is_applicable) {
loadtest "x11/khelpcenter.pm";
loadtest "x11/systemsettings.pm";
if (get_var("PLASMA5")) {
loadtest "x11/systemsettings5.pm";
}
else {
loadtest "x11/systemsettings.pm";
}
loadtest "x11/dolphin.pm";
}
if (snapper_is_applicable) {
Expand Down
22 changes: 22 additions & 0 deletions tests/x11/systemsettings5.pm
@@ -0,0 +1,22 @@
# SUSE's openQA tests
#
# Copyright © 2009-2013 Bernhard M. Wiedemann
# Copyright © 2012-2016 SUSE LLC
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved. This file is offered as-is,
# without any warranty.

use base "x11test";
use testapi;

sub run() {
my $self = shift;
x11_start_program("systemsettings5", 6, {valid => 1});
assert_screen 'test-systemsettings-1';
send_key "alt-f4";
}

1;
# vim: set sw=4 et: